[FFmpeg-cvslog] h264_mp4toannexb: fix pps offfset fault when there are more than one sps in avcc

[赵宇龙]

ffmpeg | branch: release/2.8 | 赵宇龙 <zylthinking at gmail.com> | Fri Oct  9 13:59:56 2015 +0800| [02d8abf0f576c543f2bd7d131fc876b519013f91] | committer: Michael Niedermayer

h264_mp4toannexb: fix pps offfset fault when there are more than one sps in avcc

the pps offset is used to locate pps in the spspps_buf; however, the
current calc method is wrong because it is the offset of the original
avctx->extradata;
when there is only one sps in the avcc; the value is correct by
coincidence, however, it will
fail in avcc with multi sps

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 6b32d0d86b6bec2b5cb565d6ab4556f8cd66214a)

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/h264_mp4toannexb_bsf.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264_mp4toannexb_bsf.c b/libavcodec/h264_mp4toannexb_bsf.c
index a927bab..2d447f7 100644
--- a/libavcodec/h264_mp4toannexb_bsf.c
+++ b/libavcodec/h264_mp4toannexb_bsf.c
@@ -122,7 +122,7 @@ pps:
         if (!unit_nb && !sps_done++) {
             unit_nb = *extradata++; /* number of pps unit(s) */
             if (unit_nb) {
-                ctx->pps_offset = (extradata - 1) - (avctx->extradata + 4);
+                ctx->pps_offset = total_size;
                 pps_seen = 1;
             }
         }