Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Feb 2014 22:20:09 +0000 (23:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Feb 2014 22:21:03 +0000 (23:21 +0100)
* qatar/master:
  lavc: set AVFrame pkt_pts and reordered_opaque in reget_buffer

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

Simple merge