[FFmpeg-cvslog] Merge commit '4d0d55cd623bcd504867f948849380f6b4060b4d'
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Sun Jul 26 11:39:09 2015 +0200| [ce466275f8d62dd8c20923c59cb0476cc0bd9e0f] | committer: Michael Niedermayer Merge commit '4d0d55cd623bcd504867f948849380f6b4060b4d' * commit '4d0d55cd623bcd504867f948849380f6b4060b4d': checkasm: Use LOCAL_ALIGNED See: f467fc02b475cd45b68aa5fb5f7c78286110ba86 See: 9e83ac6114de3d94eb992eff8ed810234069a7b2 Merged-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ce466275f8d62dd8c20923c59cb0476cc0bd9e0f --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] checkasm: Use LOCAL_ALIGNED
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Fri
Jul 24 23:46:21 2015 +0200| [4d0d55cd623bcd504867f948849380f6b4060b4d] |
committer: Martin Storsjö
checkasm: Use LOCAL_ALIGNED
Fixes alignment issues and bus errors.
Signed-off-by: Martin Storsjö mar...@martin.st
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4d0d55cd623bcd504867f948849380f6b4060b4d
---
tests/checkasm/bswapdsp.c |9 +
tests/checkasm/h264pred.c |5 +++--
tests/checkasm/h264qpel.c |9 +
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/tests/checkasm/bswapdsp.c b/tests/checkasm/bswapdsp.c
index 3871029..748a886 100644
--- a/tests/checkasm/bswapdsp.c
+++ b/tests/checkasm/bswapdsp.c
@@ -22,6 +22,7 @@
#include checkasm.h
#include libavcodec/bswapdsp.h
#include libavutil/common.h
+#include libavutil/internal.h
#include libavutil/intreadwrite.h
#define BUF_SIZE 512
@@ -55,10 +56,10 @@
void checkasm_check_bswapdsp(void)
{
-DECLARE_ALIGNED(16, uint8_t, src0)[BUF_SIZE];
-DECLARE_ALIGNED(16, uint8_t, src1)[BUF_SIZE];
-DECLARE_ALIGNED(16, uint8_t, dst0)[BUF_SIZE];
-DECLARE_ALIGNED(16, uint8_t, dst1)[BUF_SIZE];
+LOCAL_ALIGNED_16(uint8_t, src0, [BUF_SIZE]);
+LOCAL_ALIGNED_16(uint8_t, src1, [BUF_SIZE]);
+LOCAL_ALIGNED_16(uint8_t, dst0, [BUF_SIZE]);
+LOCAL_ALIGNED_16(uint8_t, dst1, [BUF_SIZE]);
BswapDSPContext h;
ff_bswapdsp_init(h);
diff --git a/tests/checkasm/h264pred.c b/tests/checkasm/h264pred.c
index 40e949a..08f23e6 100644
--- a/tests/checkasm/h264pred.c
+++ b/tests/checkasm/h264pred.c
@@ -23,6 +23,7 @@
#include libavcodec/avcodec.h
#include libavcodec/h264pred.h
#include libavutil/common.h
+#include libavutil/internal.h
#include libavutil/intreadwrite.h
static const int codec_ids[4] = { AV_CODEC_ID_H264, AV_CODEC_ID_VP8,
AV_CODEC_ID_RV40, AV_CODEC_ID_SVQ3 };
@@ -232,8 +233,8 @@ void checkasm_check_h264pred(void)
{ check_pred8x8l, pred8x8l },
};
-DECLARE_ALIGNED(16, uint8_t, buf0)[BUF_SIZE];
-DECLARE_ALIGNED(16, uint8_t, buf1)[BUF_SIZE];
+LOCAL_ALIGNED_16(uint8_t, buf0, [BUF_SIZE]);
+LOCAL_ALIGNED_16(uint8_t, buf1, [BUF_SIZE]);
H264PredContext h;
int test, codec, chroma_format, bit_depth;
diff --git a/tests/checkasm/h264qpel.c b/tests/checkasm/h264qpel.c
index 01b97ae..a67bbb4 100644
--- a/tests/checkasm/h264qpel.c
+++ b/tests/checkasm/h264qpel.c
@@ -22,6 +22,7 @@
#include checkasm.h
#include libavcodec/h264qpel.h
#include libavutil/common.h
+#include libavutil/internal.h
#include libavutil/intreadwrite.h
static const uint32_t pixel_mask[3] = { 0x, 0x01ff01ff, 0x03ff03ff };
@@ -48,10 +49,10 @@ static const uint32_t pixel_mask[3] = { 0x,
0x01ff01ff, 0x03ff03ff };
void checkasm_check_h264qpel(void)
{
-DECLARE_ALIGNED(16, uint8_t, buf0)[BUF_SIZE];
-DECLARE_ALIGNED(16, uint8_t, buf1)[BUF_SIZE];
-DECLARE_ALIGNED(16, uint8_t, dst0)[BUF_SIZE];
-DECLARE_ALIGNED(16, uint8_t, dst1)[BUF_SIZE];
+LOCAL_ALIGNED_16(uint8_t, buf0, [BUF_SIZE]);
+LOCAL_ALIGNED_16(uint8_t, buf1, [BUF_SIZE]);
+LOCAL_ALIGNED_16(uint8_t, dst0, [BUF_SIZE]);
+LOCAL_ALIGNED_16(uint8_t, dst1, [BUF_SIZE]);
H264QpelContext h;
int op, bit_depth, i, j;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/avrndec: Fix cropping
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Sun
Jul 26 17:05:03 2015 +0200| [e0031ca29a471c4a540ba2e01b3f81af03ef757b] |
committer: Michael Niedermayer
avcodec/avrndec: Fix cropping
This also switches to using a separate AVCodecContext for the inner mjpeg
decoder
which is cleaner and avoids fields from being overwritten with wrong values
Fixes Ticket162
Signed-off-by: Michael Niedermayer mich...@niedermayer.cc
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e0031ca29a471c4a540ba2e01b3f81af03ef757b
---
libavcodec/avrndec.c | 56 +++---
1 file changed, 49 insertions(+), 7 deletions(-)
diff --git a/libavcodec/avrndec.c b/libavcodec/avrndec.c
index 7a50a5c..7c156cc 100644
--- a/libavcodec/avrndec.c
+++ b/libavcodec/avrndec.c
@@ -26,7 +26,7 @@
#include libavutil/imgutils.h
typedef struct {
-MJpegDecodeContext mjpeg_ctx;
+AVCodecContext *mjpeg_avctx;
int is_mjpeg;
int interlace; //FIXME use frame.interlaced_frame
int tff;
@@ -45,8 +45,31 @@ static av_cold int init(AVCodecContext *avctx)
return AVERROR(EINVAL);
}
-if(a-is_mjpeg)
-return ff_mjpeg_decode_init(avctx);
+if(a-is_mjpeg) {
+AVCodec *codec = avcodec_find_decoder(AV_CODEC_ID_MJPEG);
+AVDictionary *thread_opt = NULL;
+if (!codec) {
+av_log(avctx, AV_LOG_ERROR, MJPEG codec not found\n);
+return AVERROR_DECODER_NOT_FOUND;
+}
+
+a-mjpeg_avctx = avcodec_alloc_context3(codec);
+
+av_dict_set(thread_opt, threads, 1, 0); // Is this needed ?
+a-mjpeg_avctx-refcounted_frames = 1;
+a-mjpeg_avctx-flags = avctx-flags;
+a-mjpeg_avctx-idct_algo = avctx-idct_algo;
+a-mjpeg_avctx-lowres = avctx-lowres;
+a-mjpeg_avctx-width = avctx-width;
+a-mjpeg_avctx-height = avctx-height;
+
+if ((ret = ff_codec_open2_recursive(a-mjpeg_avctx, codec,
thread_opt)) 0) {
+av_log(avctx, AV_LOG_ERROR, MJPEG codec failed to open\n);
+}
+av_dict_free(thread_opt);
+
+return ret;
+}
if ((ret = av_image_check_size(avctx-width, avctx-height, 0, avctx)) 0)
return ret;
@@ -68,8 +91,8 @@ static av_cold int end(AVCodecContext *avctx)
{
AVRnContext *a = avctx-priv_data;
-if(a-is_mjpeg)
-ff_mjpeg_decode_end(avctx);
+avcodec_close(a-mjpeg_avctx);
+av_freep(a-mjpeg_avctx);
return 0;
}
@@ -83,8 +106,27 @@ static int decode_frame(AVCodecContext *avctx, void *data,
int buf_size = avpkt-size;
int y, ret, true_height;
-if(a-is_mjpeg)
-return ff_mjpeg_decode_frame(avctx, data, got_frame, avpkt);
+if(a-is_mjpeg) {
+ret = avcodec_decode_video2(a-mjpeg_avctx, data, got_frame, avpkt);
+
+if (ret = 0 *got_frame avctx-width = p-width
avctx-height = p-height) {
+int shift = p-height - avctx-height;
+int subsample_h, subsample_v;
+
+av_pix_fmt_get_chroma_sub_sample(avctx-pix_fmt, subsample_h,
subsample_v);
+
+p-data[0] += p-linesize[0] * shift;
+if (p-data[2]) {
+p-data[1] += p-linesize[1] * (shiftsubsample_v);
+p-data[2] += p-linesize[2] * (shiftsubsample_v);
+}
+
+p-width = avctx-width;
+p-height = avctx-height;
+}
+avctx-pix_fmt = a-mjpeg_avctx-pix_fmt;
+return ret;
+}
true_height= buf_size / (2*avctx-width);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to be able to use dxva.h
ffmpeg | branch: master | Steve Lhomme rob...@gmail.com | Sun Jul 26 13:35:47 2015 +0200| [9b4b96c0dee90d260891ec765b28f6ca15594340] | committer: Martin Storsjö force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to be able to use dxva.h The struct definitions in dxva.h, which are necessary in order to actually use d3d11va, are hidden when WINAPI_FAMILY targets Windows Phone or WindowsRT. Building with WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP is disallowed when targeting ARM. (Compiling Desktop applications for the ARM platform is not supported.) So we set _CRT_BUILD_DESKTOP_APP to 0 to tell the runtime not to detect some issues with this mismatching. The same tweaks to detect if the API is available is done in dxva2_internal.h when compiling each DXVA2/D3D11VA decoders. Signed-off-by: Martin Storsjö mar...@martin.st http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b4b96c0dee90d260891ec765b28f6ca15594340 --- configure |2 +- libavcodec/dxva2_internal.h |9 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 973edb4..98a34c6 100755 --- a/configure +++ b/configure @@ -4270,7 +4270,7 @@ check_lib2 windows.h psapi.h GetProcessMemoryInfo -lpsapi check_struct sys/time.h sys/resource.h struct rusage ru_maxrss -check_type windows.h dxva.h DXVA_PicParams_HEVC +check_type windows.h dxva.h DXVA_PicParams_HEVC -DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP -D_CRT_BUILD_DESKTOP_APP=0 check_type windows.h d3d11.h ID3D11VideoDecoder check_type d3d9.h dxva2api.h DXVA2_ConfigPictureDecode -D_WIN32_WINNT=0x0600 diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h index 3b651a4..7155123 100644 --- a/libavcodec/dxva2_internal.h +++ b/libavcodec/dxva2_internal.h @@ -27,6 +27,9 @@ #include config.h +/* define the proper COM entries before forcing desktop APIs */ +#include objbase.h + #if CONFIG_DXVA2 #include dxva2.h #endif @@ -34,6 +37,12 @@ #include d3d11va.h #endif #if HAVE_DXVA_H +/* When targeting WINAPI_FAMILY_PHONE_APP or WINAPI_FAMILY_APP, dxva.h + * defines nothing. Force the struct definitions to be visible. */ +#undef WINAPI_FAMILY +#define WINAPI_FAMILY WINAPI_FAMILY_DESKTOP_APP +#undef _CRT_BUILD_DESKTOP_APP +#define _CRT_BUILD_DESKTOP_APP 0 #include dxva.h #endif ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '9b4b96c0dee90d260891ec765b28f6ca15594340'
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Sun Jul 26 22:41:18 2015 +0200| [508c815d4db0a79576a9e175b2e6d09bb35c] | committer: Michael Niedermayer Merge commit '9b4b96c0dee90d260891ec765b28f6ca15594340' * commit '9b4b96c0dee90d260891ec765b28f6ca15594340': force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to be able to use dxva.h Conflicts: libavcodec/dxva2_internal.h See: c5327df838396e7c43a56bdd141c0f01ba3edc94 Merged-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=508c815d4db0a79576a9e175b2e6d09bb35c --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to use DVXA
ffmpeg | branch: master | Steve Lhomme rob...@gmail.com | Sun Jul 26 13:35:47 2015 +0200| [c5327df838396e7c43a56bdd141c0f01ba3edc94] | committer: Michael Niedermayer force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to use DVXA The struct definitions in dxva.h, which are necessary in order to actually use d3d11va, are hidden when WINAPI_FAMILY targets Windows Phone or WindowsRT. Building with WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP is disallowed when targeting ARM. (Compiling Desktop applications for the ARM platform is not supported.) So we set _CRT_BUILD_DESKTOP_APP to 0 to tell the runtime not to detect some issues with this mismatching. The same tweaks to detect if the API is available is done in dxva2_internal.h when compiling each DXVA2/D3D11VA decoders. Signed-off-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c5327df838396e7c43a56bdd141c0f01ba3edc94 --- configure |2 +- libavcodec/dxva2_internal.h |7 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configure b/configure index bfed9e6..116f5a2 100755 --- a/configure +++ b/configure @@ -5098,7 +5098,7 @@ check_lib2 windows.h psapi.h GetProcessMemoryInfo -lpsapi check_struct sys/time.h sys/resource.h struct rusage ru_maxrss -check_type windows.h dxva.h DXVA_PicParams_HEVC +check_type windows.h dxva.h DXVA_PicParams_HEVC -DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP -D_CRT_BUILD_DESKTOP_APP=0 check_type windows.h d3d11.h ID3D11VideoDecoder check_type d3d9.h dxva2api.h DXVA2_ConfigPictureDecode -D_WIN32_WINNT=0x0600 diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h index 426de9d..d5cc01e 100644 --- a/libavcodec/dxva2_internal.h +++ b/libavcodec/dxva2_internal.h @@ -27,6 +27,9 @@ #include config.h +/* define the proper COM entries before forcing desktop APIs */ +#include objbase.h + #if CONFIG_DXVA2 #include dxva2.h #endif @@ -35,6 +38,10 @@ #endif #if HAVE_DXVA_H +/* dxva.h defines nothing otherwise but it works */ +#undef WINAPI_FAMILY +#define WINAPI_FAMILY WINAPI_FAMILY_DESKTOP_APP +#define _CRT_BUILD_DESKTOP_APP 0 #include dxva.h #endif ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/hlsenc: Fix wording in comment
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Sun
Jul 26 22:06:19 2015 +0200| [29a43bd588b03766d0e9accbaebfc255a1709862] |
committer: Michael Niedermayer
avformat/hlsenc: Fix wording in comment
Signed-off-by: Michael Niedermayer mich...@niedermayer.cc
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29a43bd588b03766d0e9accbaebfc255a1709862
---
libavformat/hlsenc.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index eea7c81..2c0c6f0 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -662,7 +662,7 @@ static int hls_write_header(AVFormatContext *s)
else if (hls-vtt_avf)
inner_st = hls-vtt_avf-streams[0];
else {
-/* We have subtitle stream, when user dont want */
+/* We have a subtitle stream, when the user does not want one */
inner_st = NULL;
continue;
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/dvbsubdec: Compute default CLUT based on bitmap analysis
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Sun
Jul 26 14:22:41 2015 +0200| [4b90dcb8493552c17a811c8b1e6538dae4061f9d] |
committer: Michael Niedermayer
avcodec/dvbsubdec: Compute default CLUT based on bitmap analysis
Fixes displaying subtitles before any CLUT has been received
Fixes Ticket153
This will of course not display these initial subtitles in the correct
color (as that is not known at that point) but they should look clean
and not corrupted
Signed-off-by: Michael Niedermayer mich...@niedermayer.cc
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4b90dcb8493552c17a811c8b1e6538dae4061f9d
---
libavcodec/dvbsubdec.c | 60
1 file changed, 60 insertions(+)
diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c
index e268e2a..9f59b72 100644
--- a/libavcodec/dvbsubdec.c
+++ b/libavcodec/dvbsubdec.c
@@ -754,6 +754,63 @@ static int dvbsub_read_8bit_string(AVCodecContext *avctx,
return pixels_read;
}
+static void compute_default_clut(AVPicture *frame, int w, int h)
+{
+uint8_t list[256] = {0};
+uint8_t list_inv[256];
+int counttab[256] = {0};
+int count, i, x, y;
+
+#define V(x,y) frame-data[0][(x) + (y)*frame-linesize[0]]
+for (y = 0; yh; y++) {
+for (x = 0; xw; x++) {
+int v = V(x,y) + 1;
+int vl = x ? V(x-1,y) + 1 : 0;
+int vr = x+1w ? V(x+1,y) + 1 : 0;
+int vt = y ? V(x,y-1) + 1 : 0;
+int vb = y+1h ? V(x,y+1) + 1 : 0;
+counttab[v-1] += !!((v!=vl) + (v!=vr) + (v!=vt) + (v!=vb));
+}
+}
+#define L(x,y) list[ frame-data[0][(x) + (y)*frame-linesize[0]] ]
+
+for (i = 0; i256; i++) {
+int scoretab[256] = {0};
+int bestscore = 0;
+int bestv = 0;
+for (y = 0; yh; y++) {
+for (x = 0; xw; x++) {
+int v = frame-data[0][x + y*frame-linesize[0]];
+int l_m = list[v];
+int l_l = x ? L(x-1, y) : 1;
+int l_r = x+1w ? L(x+1, y) : 1;
+int l_t = y ? L(x, y-1) : 1;
+int l_b = y+1h ? L(x, y+1) : 1;
+int score;
+if (l_m)
+continue;
+scoretab[v] += l_l + l_r + l_t + l_b;
+score = 1024LL*scoretab[v] / counttab[v];
+if (score bestscore) {
+bestscore = score;
+bestv = v;
+}
+}
+}
+if (!bestscore)
+break;
+list[ bestv ] = 1;
+list_inv[ i ] = bestv;
+}
+
+count = i - 1;
+for (i--; i=0; i--) {
+int v = i*255/count;
+AV_WN32(frame-data[1] + 4*list_inv[i], RGBA(v/2,v,v/2,v));
+}
+}
+
+
static int save_subtitle_set(AVCodecContext *avctx, AVSubtitle *sub, int
*got_output)
{
DVBSubContext *ctx = avctx-priv_data;
@@ -855,6 +912,9 @@ static int save_subtitle_set(AVCodecContext *avctx,
AVSubtitle *sub, int *got_ou
memcpy(rect-pict.data[0], region-pbuf, region-buf_size);
+if (clut == default_clut)
+compute_default_clut(rect-pict, rect-w, rect-h);
+
i++;
}
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] movtextdec.c: Add support for fontsize
ffmpeg | branch: master | Niklesh niklesh.lalw...@iitb.ac.in | Fri Jul 24
14:53:16 2015 +0530| [f21fcf60eca9f9fde80095eea11b0d54b116d683] | committer:
Philip Langdale
movtextdec.c: Add support for fontsize
Add support for fontsize in style records. The patch uses reset to
directly change back to default style instead of using closing tags,
since we are not handling the default styles right now.
Signed-off-by: Niklesh niklesh.lalw...@iitb.ac.in
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f21fcf60eca9f9fde80095eea11b0d54b116d683
---
libavcodec/movtextdec.c | 14 ++
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c
index ca02107..869358c 100644
--- a/libavcodec/movtextdec.c
+++ b/libavcodec/movtextdec.c
@@ -39,6 +39,7 @@ typedef struct {
uint16_t style_start;
uint16_t style_end;
uint8_t style_flag;
+uint8_t fontsize;
} StyleBox;
typedef struct {
@@ -120,13 +121,14 @@ static int decode_styl(const uint8_t *tsmb,
MovTextContext *m, AVPacket *avpkt)
// fontID = AV_RB16(tsmb);
tsmb += 2;
m-s_temp-style_flag = AV_RB8(tsmb);
+tsmb++;
+m-s_temp-fontsize = AV_RB8(tsmb);
av_dynarray_add(m-s, m-count_s, m-s_temp);
if(!m-s) {
mov_text_cleanup(m);
return AVERROR(ENOMEM);
}
-// fontsize = AV_RB8(tsmb);
-tsmb += 2;
+tsmb++;
// text-color-rgba
tsmb += 4;
}
@@ -150,12 +152,7 @@ static int text_to_ass(AVBPrint *buf, const char *text,
const char *text_end,
if (m-box_flags STYL_BOX) {
for (i = 0; i m-style_entries; i++) {
if (m-s[i]-style_flag text_pos == m-s[i]-style_end) {
-if (m-s[i]-style_flag STYLE_FLAG_BOLD)
-av_bprintf(buf, {\\b0});
-if (m-s[i]-style_flag STYLE_FLAG_ITALIC)
-av_bprintf(buf, {\\i0});
-if (m-s[i]-style_flag STYLE_FLAG_UNDERLINE)
-av_bprintf(buf, {\\u0});
+av_bprintf(buf, {\\r});
}
}
for (i = 0; i m-style_entries; i++) {
@@ -166,6 +163,7 @@ static int text_to_ass(AVBPrint *buf, const char *text,
const char *text_end,
av_bprintf(buf, {\\i1});
if (m-s[i]-style_flag STYLE_FLAG_UNDERLINE)
av_bprintf(buf, {\\u1});
+av_bprintf(buf, {\\fs%d}, m-s[i]-fontsize);
}
}
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: Only redefine inline to __inline for msvc if necessary
ffmpeg | branch: master | Martin Storsjö mar...@martin.st | Sat Jul 25
22:47:47 2015 +0300| [5fd553d31272d5ed42a7a5a0ecaab7b3452da83a] | committer:
Martin Storsjö
configure: Only redefine inline to __inline for msvc if necessary
This isn't necessary on MSVC 2015 any longer.
Signed-off-by: Martin Storsjö mar...@martin.st
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5fd553d31272d5ed42a7a5a0ecaab7b3452da83a
---
configure | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index ae6ad17..f97104a 100755
--- a/configure
+++ b/configure
@@ -3057,7 +3057,7 @@ probe_cc(){
_ld_lib='lib%.a'
_ld_path='-libpath:'
_flags='-nologo'
-_cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS
-Dinline=__inline -Dstrtoll=_strtoi64'
+_cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS
-Dstrtoll=_strtoi64'
elif $_cc 21 | grep -q Intel; then
_type=icl
_ident=$($_cc 21 | head -n1)
@@ -4691,6 +4691,17 @@ EOF
fi
fi
+for pfx in host_; do
+pfx_no_=${pfx%_}
+varname=${pfx_no_}cc_type
+eval type=\$$varname
+if [ $type = msvc ]; then
+check_${pfx}cc EOF || add_${pfx}cflags -Dinline=__inline
+static inline int foo(int a) { return a; }
+EOF
+fi
+done
+
case $as_type in
clang)
add_asflags -Qunused-arguments
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '5fd553d31272d5ed42a7a5a0ecaab7b3452da83a'
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Sun Jul 26 23:19:56 2015 +0200| [27e61a716c893a6ae67ca8f859c735bc0b0b799a] | committer: Michael Niedermayer Merge commit '5fd553d31272d5ed42a7a5a0ecaab7b3452da83a' * commit '5fd553d31272d5ed42a7a5a0ecaab7b3452da83a': configure: Only redefine inline to __inline for msvc if necessary Conflicts: configure Merged-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=27e61a716c893a6ae67ca8f859c735bc0b0b799a --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '0cff125200ab53fa3ae70d85b4f614f269fe3426'
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Sun Jul 26 22:58:09 2015 +0200| [867686997cbacd06cf5056c2741494bda23a7819] | committer: Michael Niedermayer Merge commit '0cff125200ab53fa3ae70d85b4f614f269fe3426' * commit '0cff125200ab53fa3ae70d85b4f614f269fe3426': configure: Only add -FIstdlib.h for msvc/icl if necessary Conflicts: configure Merged-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=867686997cbacd06cf5056c2741494bda23a7819 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: Only add -FIstdlib.h for msvc/icl if necessary
ffmpeg | branch: master | Martin Storsjö mar...@martin.st | Sat Jul 25
22:09:21 2015 +0300| [0cff125200ab53fa3ae70d85b4f614f269fe3426] | committer:
Martin Storsjö
configure: Only add -FIstdlib.h for msvc/icl if necessary
This is only necessary on MSVC 2010/2012 (and possibly on some
ICL versions). This both avoids an extra hack on newer MSVC
versions, and better documents what the extra compiler option
is used for.
Signed-off-by: Martin Storsjö mar...@martin.st
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0cff125200ab53fa3ae70d85b4f614f269fe3426
---
configure | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 98a34c6..ae6ad17 100755
--- a/configure
+++ b/configure
@@ -3057,7 +3057,7 @@ probe_cc(){
_ld_lib='lib%.a'
_ld_path='-libpath:'
_flags='-nologo'
-_cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS
-Dinline=__inline -FIstdlib.h -Dstrtoll=_strtoi64'
+_cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS
-Dinline=__inline -Dstrtoll=_strtoi64'
elif $_cc 21 | grep -q Intel; then
_type=icl
_ident=$($_cc 21 | head -n1)
@@ -3080,7 +3080,7 @@ probe_cc(){
_flags='-nologo -Qdiag-error:4044,10157'
# -Qvec- -Qsimd- to prevent miscompilation, -GS for consistency
# with MSVC which enables it by default.
-_cflags='-D_USE_MATH_DEFINES -FIstdlib.h -Dstrtoll=_strtoi64 -Qms0
-Qvec- -Qsimd- -GS'
+_cflags='-D_USE_MATH_DEFINES -Dstrtoll=_strtoi64 -Qms0 -Qvec- -Qsimd-
-GS'
elif $_cc --version 2/dev/null | grep -q ^cparser; then
_type=cparser
_ident=$($_cc --version | head -n1)
@@ -4678,6 +4678,17 @@ elif enabled_any msvc icl; then
fi
# msvcrt10 x64 incorrectly enables log2, only msvcrt12 (MSVC 2013) onwards
actually has log2.
check_cpp_condition crtversion.h _VC_CRT_MAJOR_VERSION = 12 || disable
log2
+# The CRT headers contain __declspec(restrict) in a few places, but if
redefining
+# restrict, this might break. MSVC 2010 and 2012 fail with
__declspec(__restrict)
+# (as it ends up if the restrict redefine is done before including
stdlib.h), while
+# MSVC 2013 and newer can handle it fine.
+# If this declspec fails, force including stdlib.h before the restrict
redefinition
+# happens in config.h.
+if [ $_restrict != restrict ]; then
+check_cc EOF || add_cflags -FIstdlib.h
+__declspec($_restrict) void* foo(int);
+EOF
+fi
fi
case $as_type in
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '342b0ba5f93b09b1d0c2597db44605300e6fcc53'
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Sun Jul 26 23:32:29 2015 +0200| [dcc540db6ee0f41edd09b40d9854fb1a6509eab3] | committer: Michael Niedermayer Merge commit '342b0ba5f93b09b1d0c2597db44605300e6fcc53' * commit '342b0ba5f93b09b1d0c2597db44605300e6fcc53': configure: Only redirect strtoll to _strtoi64 if necessary Conflicts: configure Merged-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dcc540db6ee0f41edd09b40d9854fb1a6509eab3 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: Only redirect strtoll to _strtoi64 if necessary
ffmpeg | branch: master | Martin Storsjö mar...@martin.st | Sat Jul 25
22:54:26 2015 +0300| [342b0ba5f93b09b1d0c2597db44605300e6fcc53] | committer:
Martin Storsjö
configure: Only redirect strtoll to _strtoi64 if necessary
This isn't necessary any longer on MSVC 2013 Update 4.
Signed-off-by: Martin Storsjö mar...@martin.st
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=342b0ba5f93b09b1d0c2597db44605300e6fcc53
---
configure |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index f97104a..66edc14 100755
--- a/configure
+++ b/configure
@@ -3057,7 +3057,7 @@ probe_cc(){
_ld_lib='lib%.a'
_ld_path='-libpath:'
_flags='-nologo'
-_cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS
-Dstrtoll=_strtoi64'
+_cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS'
elif $_cc 21 | grep -q Intel; then
_type=icl
_ident=$($_cc 21 | head -n1)
@@ -3080,7 +3080,7 @@ probe_cc(){
_flags='-nologo -Qdiag-error:4044,10157'
# -Qvec- -Qsimd- to prevent miscompilation, -GS for consistency
# with MSVC which enables it by default.
-_cflags='-D_USE_MATH_DEFINES -Dstrtoll=_strtoi64 -Qms0 -Qvec- -Qsimd-
-GS'
+_cflags='-D_USE_MATH_DEFINES -Qms0 -Qvec- -Qsimd- -GS'
elif $_cc --version 2/dev/null | grep -q ^cparser; then
_type=cparser
_ident=$($_cc --version | head -n1)
@@ -4689,6 +4689,7 @@ elif enabled_any msvc icl; then
__declspec($_restrict) void* foo(int);
EOF
fi
+check_func strtoll || add_cflags -Dstrtoll=_strtoi64
fi
for pfx in host_; do
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] ffserver: drop superfluous else clause
ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet
reyna...@osg.samsung.com | Sun Jul 26 23:53:08 2015 -0300|
[b16b8c815c2c94ac2bbe0ee1a1775f76963339ea] | committer: Reynaldo H. Verdejo
Pinochet
ffserver: drop superfluous else clause
Signed-off-by: Reynaldo H. Verdejo Pinochet reyna...@osg.samsung.com
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b16b8c815c2c94ac2bbe0ee1a1775f76963339ea
---
ffserver.c |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index b4e6093..42025ab 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2541,9 +2541,8 @@ static int http_start_receive_data(HTTPContext *c)
http_log(Error reading write index from feed file '%s': %s\n,
c-stream-feed_filename, strerror(errno));
return ret;
-} else {
-c-stream-feed_write_index = ret;
}
+c-stream-feed_write_index = ret;
}
c-stream-feed_write_index = FFMAX(ffm_read_write_index(fd),
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] ffserver: move decl to start of func
ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet
reyna...@osg.samsung.com | Sun Jul 26 22:29:47 2015 -0300|
[2ea642ff4b730fcfc70cf6dc0c959762b8c9d799] | committer: Reynaldo H. Verdejo
Pinochet
ffserver: move decl to start of func
Signed-off-by: Reynaldo H. Verdejo Pinochet reyna...@osg.samsung.com
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ea642ff4b730fcfc70cf6dc0c959762b8c9d799
---
ffserver.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffserver.c b/ffserver.c
index 5082a4c..551ef88 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -316,12 +316,12 @@ static char *ctime1(char *buf2, int buf_size)
static void http_vlog(const char *fmt, va_list vargs)
{
static int print_prefix = 1;
+char buf[32];
if (!logfile)
return;
if (print_prefix) {
-char buf[32];
ctime1(buf, sizeof(buf));
fprintf(logfile, %s , buf);
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] ffserver: simplify assignment with ternary
ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet
reyna...@osg.samsung.com | Sun Jul 26 23:11:37 2015 -0300|
[c75bc268a2894d26e793d0c12e84d4ec6cc24860] | committer: Reynaldo H. Verdejo
Pinochet
ffserver: simplify assignment with ternary
Signed-off-by: Reynaldo H. Verdejo Pinochet reyna...@osg.samsung.com
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c75bc268a2894d26e793d0c12e84d4ec6cc24860
---
ffserver.c | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 551ef88..b4e6093 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -703,13 +703,9 @@ static void start_wait_request(HTTPContext *c, int is_rtsp)
c-buffer_ptr = c-buffer;
c-buffer_end = c-buffer + c-buffer_size - 1; /* leave room for '\0' */
-if (is_rtsp) {
-c-timeout = cur_time + RTSP_REQUEST_TIMEOUT;
-c-state = RTSPSTATE_WAIT_REQUEST;
-} else {
-c-timeout = cur_time + HTTP_REQUEST_TIMEOUT;
-c-state = HTTPSTATE_WAIT_REQUEST;
-}
+c-state = is_rtsp ? RTSPSTATE_WAIT_REQUEST : HTTPSTATE_WAIT_REQUEST;
+c-timeout = cur_time +
+ is_rtsp ? RTSP_REQUEST_TIMEOUT : HTTP_REQUEST_TIMEOUT;
}
static void http_send_too_busy_reply(int fd)
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/dvbsubdec: Add option to select when to computer clut (always/ never/if needed)
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Sun
Jul 26 18:38:18 2015 +0200| [d41dceb14e0697a53c2ba59d01e3180b0ea724f7] |
committer: Michael Niedermayer
avcodec/dvbsubdec: Add option to select when to computer clut (always/never/if
needed)
Reviewed-by: Anshul anshul.ffm...@gmail.com
Signed-off-by: Michael Niedermayer mich...@niedermayer.cc
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d41dceb14e0697a53c2ba59d01e3180b0ea724f7
---
libavcodec/dvbsubdec.c |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c
index 9f59b72..e3b72ab 100644
--- a/libavcodec/dvbsubdec.c
+++ b/libavcodec/dvbsubdec.c
@@ -237,6 +237,7 @@ typedef struct DVBSubContext {
int time_out;
int compute_edt; /** if 1 end display time calculated using pts
if 0 (Default) calculated using time out */
+int compute_clut;
int64_t prev_start;
DVBSubRegion *region_list;
DVBSubCLUT *clut_list;
@@ -912,7 +913,7 @@ static int save_subtitle_set(AVCodecContext *avctx,
AVSubtitle *sub, int *got_ou
memcpy(rect-pict.data[0], region-pbuf, region-buf_size);
-if (clut == default_clut)
+if ((clut == default_clut ctx-compute_clut == -1) ||
ctx-compute_clut == 1)
compute_default_clut(rect-pict, rect-w, rect-h);
i++;
@@ -1706,6 +1707,7 @@ end:
#define DS AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_SUBTITLE_PARAM
static const AVOption options[] = {
{compute_edt, compute end of time using pts or timeout,
offsetof(DVBSubContext, compute_edt), FF_OPT_TYPE_INT, {.i64 = 0}, 0, 1, DS},
+{compute_clut, compute clut when not available(-1) or always(1) or
never(0), offsetof(DVBSubContext, compute_clut), FF_OPT_TYPE_INT, {.i64 = -1},
-1, 1, DS},
{NULL}
};
static const AVClass dvbsubdec_class = {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] doc/decoders: Add entry for dvbsub and document compute_clut
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Mon Jul 27 00:06:43 2015 +0200| [33c4fc0a2d7068b2a5c4627e9e943904d694730d] | committer: Michael Niedermayer doc/decoders: Add entry for dvbsub and document compute_clut Signed-off-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=33c4fc0a2d7068b2a5c4627e9e943904d694730d --- doc/decoders.texi | 17 + 1 file changed, 17 insertions(+) diff --git a/doc/decoders.texi b/doc/decoders.texi index 2a73cc6..5f7110c 100644 --- a/doc/decoders.texi +++ b/doc/decoders.texi @@ -195,6 +195,23 @@ without this library. @chapter Subtitles Decoders @c man begin SUBTILES DECODERS +@section dvbsub + +@subsection Options + +@table @option +@item compute_clut +@table @option +@item -1 +Compute clut if no matching CLUT is in the stream. +@item 0 +Never compute CLUT +@item 1 +Always compute CLUT and override the one provided in the stream. +@end table + +@end table + @section dvdsub This codec decodes the bitmap subtitles used in DVDs; the same subtitles can ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/nvenc: 2-pass mode works even with non-low latency presets now
ffmpeg | branch: master | WereCatf werec...@gmail.com | Sun Jul 26 16:51:41
2015 +0200| [7106dfd9456844775535e4af30c726c59d9595aa] | committer: Timo
Rothenpieler
avcodec/nvenc: 2-pass mode works even with non-low latency presets now
Github: Closes #140
Signed-off-by: Timo Rothenpieler t...@rothenpieler.org
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7106dfd9456844775535e4af30c726c59d9595aa
---
libavcodec/nvenc.c |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
index 633fb51..9c97f35 100644
--- a/libavcodec/nvenc.c
+++ b/libavcodec/nvenc.c
@@ -777,9 +777,6 @@ static av_cold int nvenc_encode_init(AVCodecContext *avctx)
ctx-encode_config.encodeCodecConfig.h264Config.adaptiveTransformMode =
NV_ENC_H264_ADAPTIVE_TRANSFORM_ENABLE;
ctx-encode_config.encodeCodecConfig.h264Config.fmoMode =
NV_ENC_H264_FMO_DISABLE;
}
-
-if (!isLL)
-av_log(avctx, AV_LOG_WARNING, Twopass mode is only known to
work with low latency (ll, llhq, llhp) presets.\n);
} else {
ctx-encode_config.rcParams.rateControlMode = NV_ENC_PARAMS_RC_CBR;
}
@@ -1412,7 +1409,7 @@ static const AVOption options[] = {
{ level, Set the encoding level restriction (auto, 1.0, 1.0b, 1.1, 1.2,
..., 4.2, 5.0, 5.1), OFFSET(level), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE },
{ tier, Set the encoding tier (main or high), OFFSET(tier),
AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE },
{ cbr, Use cbr encoding mode, OFFSET(cbr), AV_OPT_TYPE_INT, { .i64 = 0
}, 0, 1, VE },
-{ 2pass, Use 2pass cbr encoding mode (low latency mode only),
OFFSET(twopass), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE },
+{ 2pass, Use 2pass cbr encoding mode, OFFSET(twopass),
AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE },
{ gpu, Selects which NVENC capable GPU to use. First GPU is 0, second
is 1, and so on., OFFSET(gpu), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },
{ delay, Delays frame output by the given amount of frames.,
OFFSET(buffer_delay), AV_OPT_TYPE_INT, { .i64 = INT_MAX }, 0, INT_MAX, VE },
{ NULL }
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/isom: Use AVRN codec to handle AVDJ
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Sun
Jul 26 22:27:29 2015 +0200| [dc07e576ce72814c79c4e5a9ea2805291296a3f5] |
committer: Michael Niedermayer
avformat/isom: Use AVRN codec to handle AVDJ
Fixes cropping
Fixes Ticket4741
Signed-off-by: Michael Niedermayer mich...@niedermayer.cc
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dc07e576ce72814c79c4e5a9ea2805291296a3f5
---
libavformat/isom.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 5673c51..463033d 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -110,7 +110,7 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
{ AV_CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, /* PhotoJPEG */
{ AV_CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') }, /* Motion-JPEG (format
A) */
-{ AV_CODEC_ID_MJPEG, MKTAG('A', 'V', 'D', 'J') }, /* MJPEG with
alpha-channel (AVID JFIF meridien compressed) */
+{ AV_CODEC_ID_AVRN , MKTAG('A', 'V', 'D', 'J') }, /* MJPEG with
alpha-channel (AVID JFIF meridien compressed) */
/* { AV_CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') }, *//* MJPEG with
alpha-channel (AVID ABVB/Truevision NuVista) */
{ AV_CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') }, /* Motion JPEG OpenDML
*/
{ AV_CODEC_ID_MJPEGB, MKTAG('m', 'j', 'p', 'b') }, /* Motion-JPEG (format
B) */
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
