Merge commit '2862b63783b5556f7f3fb2d097629bc6879f833a'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 3 Feb 2016 16:49:19 +0000 (16:49 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 3 Feb 2016 16:49:19 +0000 (16:49 +0000)
commitf3af379b5c1816271b1afce0ccb2a935dc29940c
tree629aec01a415bfe4a0552d31292adbb01b31d180
parent908d010b12fadc36d8cadf6bba5e073e23b9603c
parent2862b63783b5556f7f3fb2d097629bc6879f833a
Merge commit '2862b63783b5556f7f3fb2d097629bc6879f833a'

* commit '2862b63783b5556f7f3fb2d097629bc6879f833a':
  lavc: Move prediction_method to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
20 files changed:
libavcodec/avcodec.h
libavcodec/huffyuvenc.c
libavcodec/j2kenc.c
libavcodec/jpeglsenc.c
libavcodec/libutvideo.h
libavcodec/libutvideoenc.cpp
libavcodec/ljpegenc.c
libavcodec/mjpegenc.c
libavcodec/mjpegenc_common.c
libavcodec/mjpegenc_common.h
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/options_table.h
libavcodec/pngenc.c
libavcodec/snow.h
libavcodec/snowenc.c
libavcodec/utvideo.c
libavcodec/utvideo.h
libavcodec/utvideoenc.c
tests/fate/utvideo.mak