Merge commit 'e767c9e8f2eaa116b61b8b6881b401b54bd320f5'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Mar 2015 19:42:33 +0000 (20:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Mar 2015 19:47:14 +0000 (20:47 +0100)
commit735ab7c5e04e2316afbd56643c13de17a7ac89cd
treebf15e7c1c9dd07512a35d7a9ecd654126753b82b
parentb5ca158935493f7242806f1bc59ea016672a1844
parente767c9e8f2eaa116b61b8b6881b401b54bd320f5
Merge commit 'e767c9e8f2eaa116b61b8b6881b401b54bd320f5'

* commit 'e767c9e8f2eaa116b61b8b6881b401b54bd320f5':
  flv: Validate and reject unsupported codecs

Conflicts:
libavformat/flvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/flvenc.c