summaryrefslogtreecommitdiffstats
path: root/contrib/ffmpeg
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2014-10-29 23:03:25 +0000
committerjstebbins <[email protected]>2014-10-29 23:03:25 +0000
commit387a47a9e2704ec4bd0b29d40859cff295de3b69 (patch)
tree6cb4b82ff99b94dbf8d6ec949ba37970b40f465b /contrib/ffmpeg
parent24bdb195c353244937b17b25a21dfdcb4f3e16f7 (diff)
libav: fix extradata parsing when SPS_EXT is present
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6478 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/ffmpeg')
-rw-r--r--contrib/ffmpeg/A10-h264-extradata.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/contrib/ffmpeg/A10-h264-extradata.patch b/contrib/ffmpeg/A10-h264-extradata.patch
new file mode 100644
index 000000000..9ad5c7337
--- /dev/null
+++ b/contrib/ffmpeg/A10-h264-extradata.patch
@@ -0,0 +1,14 @@
+diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
+index 145dce3..b9c47ab 100644
+--- a/libavcodec/h264_parser.c
++++ b/libavcodec/h264_parser.c
+@@ -474,7 +474,8 @@ static int h264_split(AVCodecContext *avctx,
+ * }
+ */
+ if ((state & 0xFFFFFF00) == 0x100 && (state & 0xFFFFFF1F) != 0x107 &&
+- (state & 0xFFFFFF1F) != 0x108 && (state & 0xFFFFFF1F) != 0x109) {
++ (state & 0xFFFFFF1F) != 0x108 && (state & 0xFFFFFF1F) != 0x109 &&
++ (state & 0xFFFFFF1F) != 0x10d) {
+ if (has_sps) {
+ while (i > 4 && buf[i - 5] == 0)
+ i--;