Merge commit 'ec6c1b1d832ec3261cc3faf93a18d7b2a84883c6'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 11:08:09 +0000 (13:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 11:08:12 +0000 (13:08 +0200)
commit89f4812cda5f91b46531637f2f76e6dd0bbfba79
treee4234ffaf94e19ae10eb8c5aed5c7d64ef3819e4
parentb7a025092f818e9fe5c63b36fb276654dd59d211
parentec6c1b1d832ec3261cc3faf93a18d7b2a84883c6
Merge commit 'ec6c1b1d832ec3261cc3faf93a18d7b2a84883c6'

* commit 'ec6c1b1d832ec3261cc3faf93a18d7b2a84883c6':
  mpeg12decdata: Remove unused #define

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