Merge commit '328cd2b5'

* commit '328cd2b5':
  lavc: move encoding-related code from utils.c to a new file
Merged-by: James Almer <jamrial@gmail.com>

libavcodec/Makefile

@@ -33,6 +33,7 @@ OBJS = allcodecs.o                                                      \
        d3d11va.o                                                        \
        dirac.o                                                          \
        dv_profile.o                                                     \
+       encode.o                                                         \
        imgconvert.o                                                     \
        jni.o                                                            \
        mathtables.o                                                     \