Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Mar 2013 23:27:53 +0000 (00:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Mar 2013 23:28:15 +0000 (00:28 +0100)
commit38d40ac18a3855620852e6552114caeb413497eb
tree60169e2c9159a1cac69d4a4239ba27c507221da7
parentfa3a7b55ec1be2a5274d7349d3aa1faed14d2bcb
parente760e1d408261566814e24c43119d7aca538d2eb
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: Make sure the encoder exists before inspecting supported_list

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg_filter.c