diff options
| author | Voyager1 <voyager@xbmc.org> | 2013-04-13 15:38:10 +0200 |
|---|---|---|
| committer | Voyager1 <voyager@xbmc.org> | 2013-04-13 16:00:57 +0200 |
| commit | d2e4acfd41735cf68d23e7777c50eade37b3abd9 (patch) | |
| tree | 6a7190233d329edaf31332521fba8b1004a8734d /lib/ffmpeg | |
| parent | 2ebc4d6ae299302161c6c7a4978078c380563e3f (diff) | |
ffmpeg 1.2 - fixed dvd still frames ended up in internal lavf
Diffstat (limited to 'lib/ffmpeg')
| -rw-r--r-- | lib/ffmpeg/libavformat/utils.c | 2 | ||||
| -rw-r--r-- | lib/ffmpeg/patches/0028-ffmpeg-1.2-fixed-dvd-still-frames-ended-up-in-intern.patch | 26 |
2 files changed, 27 insertions, 1 deletions
diff --git a/lib/ffmpeg/libavformat/utils.c b/lib/ffmpeg/libavformat/utils.c index c3bd3d914f..72f59d25d8 100644 --- a/lib/ffmpeg/libavformat/utils.c +++ b/lib/ffmpeg/libavformat/utils.c @@ -706,7 +706,7 @@ no_packet: if(end || av_log2(pd->buf_size) != av_log2(pd->buf_size - pkt->size)){ int score= set_codec_from_probe_data(s, st, pd); - if( (st->codec->codec_id != AV_CODEC_ID_NONE && score > AVPROBE_SCORE_RETRY) + if( (st->codec->codec_id != AV_CODEC_ID_NONE && score > AVPROBE_SCORE_RETRY-1) || end){ pd->buf_size=0; av_freep(&pd->buf); diff --git a/lib/ffmpeg/patches/0028-ffmpeg-1.2-fixed-dvd-still-frames-ended-up-in-intern.patch b/lib/ffmpeg/patches/0028-ffmpeg-1.2-fixed-dvd-still-frames-ended-up-in-intern.patch new file mode 100644 index 0000000000..d294ff174e --- /dev/null +++ b/lib/ffmpeg/patches/0028-ffmpeg-1.2-fixed-dvd-still-frames-ended-up-in-intern.patch @@ -0,0 +1,26 @@ +From a356770e3a73d79c9e4a451366930f557e3a2fa6 Mon Sep 17 00:00:00 2001 +From: Voyager1 <voyager@xbmc.org> +Date: Sat, 13 Apr 2013 15:38:10 +0200 +Subject: [PATCH 4/4] ffmpeg 1.2 - fixed dvd still frames ended up in internal + lavf + +--- + lib/ffmpeg/libavformat/utils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/ffmpeg/libavformat/utils.c b/lib/ffmpeg/libavformat/utils.c +index c3bd3d9..72f59d2 100644 +--- a/lib/ffmpeg/libavformat/utils.c ++++ b/lib/ffmpeg/libavformat/utils.c +@@ -706,7 +706,7 @@ no_packet: + + if(end || av_log2(pd->buf_size) != av_log2(pd->buf_size - pkt->size)){ + int score= set_codec_from_probe_data(s, st, pd); +- if( (st->codec->codec_id != AV_CODEC_ID_NONE && score > AVPROBE_SCORE_RETRY) ++ if( (st->codec->codec_id != AV_CODEC_ID_NONE && score > AVPROBE_SCORE_RETRY-1) + || end){ + pd->buf_size=0; + av_freep(&pd->buf); +-- +1.8.0.msysgit.0 + |