diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 16:45:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 16:46:06 +0100 |
| commit | 33a7e288ab2e453d110e1bd1da944ad5cabf833b (patch) | |
| tree | 7d1e714635ac7c405ac0a865db6b61b11cc1a010 /libavcodec/pthread.c | |
| parent | 1046cd60d4b19d6376dd18164959c3ea30477855 (diff) | |
| parent | d1780e01b8b7d6977260e7136243bf5fccd878ce (diff) | |
| download | ffmpeg-33a7e288ab2e453d110e1bd1da944ad5cabf833b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: don't warn on multiple frames per packet for codecs that expect it
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pthread.c')
0 files changed, 0 insertions, 0 deletions