Merge commit 'be00ec832c519427cd92218abac77dafdc1d5487'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 18 Dec 2015 13:27:41 +0000 (14:27 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 18 Dec 2015 13:27:41 +0000 (14:27 +0100)
commit2630f7f709049113dc03d6b999efad6acc423d67
treed7a217a844f6b7939d3f08da45c027caa9e6761c
parentec1b95dda4a856ae532a0a27aa6213040e712d68
parentbe00ec832c519427cd92218abac77dafdc1d5487
Merge commit 'be00ec832c519427cd92218abac77dafdc1d5487'

* commit 'be00ec832c519427cd92218abac77dafdc1d5487':
  lavc: Deprecate coder_type and its symbols

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/avcodec.h
libavcodec/ffv1enc.c
libavcodec/libopenh264enc.c
libavcodec/libschroedingerenc.c
libavcodec/libx264.c
libavcodec/options_table.h
libavcodec/sgienc.c
libavcodec/sunrastenc.c
libavcodec/targaenc.c
libavcodec/version.h