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)
commitdebb88776c3da9587bfc4ee07542490e51592a37
tree36d67ccf6967750aaaeea4535620a247a7759395
parent6b646fb9e2cea927a744dabb7c412a13a13d219d
parent990e2f3555bb0adae122d3599938ddcfee46e2d1
Merge commit '990e2f3555bb0adae122d3599938ddcfee46e2d1'

* commit '990e2f3555bb0adae122d3599938ddcfee46e2d1':
  avcodec: Suppress deprecation warnings from DTG code scheduled for removal

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