Merge commit 'b45c87083de67969c1598cfef41e7c947b137922'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Nov 2013 12:27:49 +0000 (13:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Nov 2013 12:49:02 +0000 (13:49 +0100)
commitd67d3e29779ac113fbf806754ef9398e52cd288b
treeae66a68d7a5938f188952671bbeb4fcbb7bfd667
parentb71e4d8717450e6d6d08125fbd24a74f082dff71
parentb45c87083de67969c1598cfef41e7c947b137922
Merge commit 'b45c87083de67969c1598cfef41e7c947b137922'

* commit 'b45c87083de67969c1598cfef41e7c947b137922':
  lavc: schedule unused FF_QSCALE_TYPE_* for removal on next bump

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