Merge commit 'ca2f19b9cc37be509d85f05c8f902860475905f8'

* commit 'ca2f19b9cc37be509d85f05c8f902860475905f8': h264: switch to h2645_parse for NAL parsing Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
FFmpeg · May 7, 2016 · 772ad7142dff590c7bb30370acf5d3c9a8fb512b · 772ad71
2 parents 9cc1ab6 + ca2f19b
commit 772ad7142dff590c7bb30370acf5d3c9a8fb512b
Unified Split

Showing with 200 additions and 307 deletions.

+3 −1 libavcodec/Makefile

+194 −306 libavcodec/h264.c

+3 −0 libavcodec/h264.h
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
@@ -308,7 +308,9 @@ OBJS-$(CONFIG_H263_ENCODER)            += mpeg4videoenc.o mpeg4video.o  \
 OBJS-$(CONFIG_H264_DECODER)            += h264.o h264_cabac.o h264_cavlc.o \
                                           h264_direct.o h264_loopfilter.o  \
                                           h264_mb.o h264_picture.o h264_ps.o \
-                                          h264_refs.o h264_sei.o h264_slice.o h264data.o h264_parse.o
+                                          h264_refs.o h264_sei.o \
+                                          h264_slice.o h264data.o h264_parse.o \
+                                          h2645_parse.o
 OBJS-$(CONFIG_H264_MEDIACODEC_DECODER) += mediacodecdec_h264.o
 OBJS-$(CONFIG_H264_MMAL_DECODER)       += mmaldec.o
 OBJS-$(CONFIG_H264_VDA_DECODER)        += vda_h264_dec.o