diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 01:52:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 01:52:53 +0100 |
| commit | 16338b4fb961acc9e6a21586987266ff9862545d (patch) | |
| tree | 6a6f631d49319d7500c302e55547c85e7dd4a7a3 /libavfilter/af_amerge.c | |
| parent | cf948200bd7083fb214bf7e1bd9ce3c82edd3303 (diff) | |
| parent | 2cab011f0f02fcff8a0629a611bcac2f0459f04a (diff) | |
| download | ffmpeg-16338b4fb961acc9e6a21586987266ff9862545d.tar.gz | |
Merge commit '2cab011f0f02fcff8a0629a611bcac2f0459f04a'
* commit '2cab011f0f02fcff8a0629a611bcac2f0459f04a':
mpegvideo: don't copy input_picture_number in update_thread_context()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_amerge.c')
0 files changed, 0 insertions, 0 deletions