diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-11 23:20:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-11 23:21:03 +0100 |
| commit | 707a07f3c2b58331482d850fbe1daad997e90ca3 (patch) | |
| tree | b478c881fb347b37225c2f2a79519898ccb2cadc /libavcodec/adx.c | |
| parent | bde58d9901589dfd2dc8fcb24c77a7c386b4a1b4 (diff) | |
| parent | 52771346dc7872e39c98508584d430567d3e8f31 (diff) | |
| download | ffmpeg-707a07f3c2b58331482d850fbe1daad997e90ca3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: set AVFrame pkt_pts and reordered_opaque in reget_buffer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adx.c')
0 files changed, 0 insertions, 0 deletions