Merge commit '990e2f3555bb0adae122d3599938ddcfee46e2d1'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 23:15:00 +0000 (01:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 23:15:11 +0000 (01:15 +0200)
* commit '990e2f3555bb0adae122d3599938ddcfee46e2d1':
  avcodec: Suppress deprecation warnings from DTG code scheduled for removal

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mpeg12dec.c
libavcodec/pthread_frame.c

Simple merge
Simple merge