diff options
author | cvs2svn <admin@example.com> | 2010-04-04 19:20:29 +0000 |
---|---|---|
committer | cvs2svn <admin@example.com> | 2010-04-04 19:20:29 +0000 |
commit | cde3ee7dade952baf6274f38ca81b316fbcf0c6a (patch) | |
tree | fd73f71d41a6d9b9a66c37eb3e6e172a6155aed3 /xine/BluRay/patches/xine-lib-1.1.16.3-ffmpeg-vc1-reopen.diff | |
parent | 07de8081b90d309a2b8aaa6050b8e71fa017ae2f (diff) | |
download | xineliboutput-libbluray-r103.tar.gz xineliboutput-libbluray-r103.tar.bz2 |
This commit was manufactured by cvs2svn to create tag 'libbluray-r103'.libbluray-r103
Diffstat (limited to 'xine/BluRay/patches/xine-lib-1.1.16.3-ffmpeg-vc1-reopen.diff')
-rw-r--r-- | xine/BluRay/patches/xine-lib-1.1.16.3-ffmpeg-vc1-reopen.diff | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/xine/BluRay/patches/xine-lib-1.1.16.3-ffmpeg-vc1-reopen.diff b/xine/BluRay/patches/xine-lib-1.1.16.3-ffmpeg-vc1-reopen.diff deleted file mode 100644 index 745931b5..00000000 --- a/xine/BluRay/patches/xine-lib-1.1.16.3-ffmpeg-vc1-reopen.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- src/combined/ffmpeg/ff_video_decoder.c 2009-04-16 14:24:20.000000000 +0300 -+++ src/combined/ffmpeg/ff_video_decoder.c 2009-09-24 15:21:25.000000000 +0300 -@@ -340,6 +340,22 @@ - return; - } - -+ if (this->codec->id == CODEC_ID_VC1 && -+ (!this->bih.biWidth || !this->bih.biHeight)) { -+ /* VC1 codec must be re-opened with correct width and height. */ -+ avcodec_close(this->context); -+ -+ if (avcodec_open (this->context, this->codec) < 0) { -+ pthread_mutex_unlock(&ffmpeg_lock); -+ xprintf (this->stream->xine, XINE_VERBOSITY_LOG, -+ _("ffmpeg_video_dec: couldn't open decoder (pass 2)\n")); -+ free(this->context); -+ this->context = NULL; -+ _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HANDLED, 0); -+ return; -+ } -+ } -+ - if (this->class->thread_count > 1) { - avcodec_thread_init(this->context, this->class->thread_count); - this->context->thread_count = this->class->thread_count; |