Merge commit '3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 10:53:57 +0000 (11:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 10:53:57 +0000 (11:53 +0100)
commitfeccf2f6b747e433766464e8a8b215cbe70c5f27
treefa169b3b674e6b9606b72141cf02f3997ca60c74
parentb3b46cd74e9facb40d18c40de23b0f0ada1a48d4
parent3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00
Merge commit '3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00'

* commit '3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00':
  lavc: remove disabled FF_API_SNOW cruft

Conflicts:
libavcodec/avcodec.h
libavcodec/options_table.h
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h
libavcodec/old_codec_ids.h