diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:05:13 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:05:13 +0100 |
| commit | 1d0b3b20c34517b9d1ddf3ea347776304b0c4b44 (patch) | |
| tree | 89f4fc640c2becc6f00ae08996754952ecf149c1 /contrib/ffmpeg/vhook/watermark.c | |
| parent | 09496ad3469a0ade8dbd9a351e639b78f20b7942 (diff) | |
| download | xine-lib-1d0b3b20c34517b9d1ddf3ea347776304b0c4b44.tar.gz xine-lib-1d0b3b20c34517b9d1ddf3ea347776304b0c4b44.tar.bz2 | |
Update internal FFmpeg copy.
Diffstat (limited to 'contrib/ffmpeg/vhook/watermark.c')
| -rw-r--r-- | contrib/ffmpeg/vhook/watermark.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/contrib/ffmpeg/vhook/watermark.c b/contrib/ffmpeg/vhook/watermark.c index aa6fee63c..a8f7d5728 100644 --- a/contrib/ffmpeg/vhook/watermark.c +++ b/contrib/ffmpeg/vhook/watermark.c @@ -435,9 +435,9 @@ void Process(void *ctx, { ContextInfo *ci = (ContextInfo *) ctx; if (1 == ci->mode) { - return Process1(ctx, picture, pix_fmt, src_width, src_height, pts); + Process1(ctx, picture, pix_fmt, src_width, src_height, pts); } else { - return Process0(ctx, picture, pix_fmt, src_width, src_height, pts); + Process0(ctx, picture, pix_fmt, src_width, src_height, pts); } } @@ -544,10 +544,6 @@ int get_watermark_picture(ContextInfo *ci, int cleanup) return -1; } - // Inform the codec that we can handle truncated bitstreams -- i.e., - // bitstreams where frame boundaries can fall in the middle of packets - if (ci->pCodec->capabilities & CODEC_CAP_TRUNCATED) - ci->pCodecCtx->flags|=CODEC_FLAG_TRUNCATED; // Open codec if(avcodec_open(ci->pCodecCtx, ci->pCodec)<0) { |