Merge commit '3fe2a01df7'

* commit '3fe2a01df7': lavc: move decoding-related code from utils.c to a new file Merged-by: James Almer <jamrial@gmail.com>
2017-04-07 01:19:56 -03:00 · 2017-04-07 01:19:56 -03:00 · 00fb745a10
commit 00fb745a10
parent bd9057e74b 3fe2a01df7
3 changed files with 1563 additions and 1521 deletions
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@ -31,6 +31,7 @@ OBJS = allcodecs.o                                                      \
       bsf.o                                                            \
       codec_desc.o                                                     \
       d3d11va.o                                                        \
+       decode.o                                                         \
       dirac.o                                                          \
       dv_profile.o                                                     \
       encode.o                                                         \
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c