[FFmpeg-cvslog] h264_parser: don't stop on SPS_EXT in split

John Stebbins git at videolan.org
Tue Nov 11 23:54:27 CET 2014


ffmpeg | branch: master | John Stebbins <stebbins at jetheaddev.com> | Fri Oct 31 08:24:38 2014 -0700| [1b667269062eb6aec0b8726393ea91b7f7f57fde] | committer: Vittorio Giovara

h264_parser: don't stop on SPS_EXT in split

Add SPS_EXT, SEI, and subset SPS to codes that are skipped during split.
These codes can come before the PPS and results in incomplete extradata.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1b667269062eb6aec0b8726393ea91b7f7f57fde
---

 libavcodec/h264_parser.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index 145dce3..2ed3dd0 100644
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@ -473,8 +473,10 @@ static int h264_split(AVCodecContext *avctx,
          *     (state&0xFFFFFF1F) == 0x105) {
          *  }
          */
-        if ((state & 0xFFFFFF00) == 0x100 && (state & 0xFFFFFF1F) != 0x107 &&
-            (state & 0xFFFFFF1F) != 0x108 && (state & 0xFFFFFF1F) != 0x109) {
+        if ((state & 0xFFFFFF00) == 0x100 && (state & 0xFFFFFF1F) != 0x106 &&
+            (state & 0xFFFFFF1F) != 0x107 && (state & 0xFFFFFF1F) != 0x108 &&
+            (state & 0xFFFFFF1F) != 0x109 && (state & 0xFFFFFF1F) != 0x10d &&
+            (state & 0xFFFFFF1F) != 0x10f) {
             if (has_sps) {
                 while (i > 4 && buf[i - 5] == 0)
                     i--;



More information about the ffmpeg-cvslog mailing list