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)
* commit 'ec6c1b1d832ec3261cc3faf93a18d7b2a84883c6':
  mpeg12decdata: Remove unused #define

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

Simple merge