diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-29 23:40:39 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-29 23:40:51 +0100 |
commit | 72afa381b3fa347f4149067845c6582469d8062e (patch) | |
tree | eb366c532e925d9be305143330a75486424e49af /libavcodec/pthread_frame.c | |
parent | fbafd64acce4a2a0aa6a5b392524a99f397e96a8 (diff) | |
parent | d67cfdeb530360748ada6ad0335af99507dd6308 (diff) | |
download | ffmpeg-72afa381b3fa347f4149067845c6582469d8062e.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avformat: utils: Refactor duplicated PRINT macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pthread_frame.c')
0 files changed, 0 insertions, 0 deletions