diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 01:58:28 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 01:58:55 +0100 |
commit | 2951b7fb1d3be236312e27a6dd6dc1dcfc467841 (patch) | |
tree | 1ad338427924c6bfd48452d80ccec15f352403da /libavfilter/pthread.c | |
parent | 16338b4fb961acc9e6a21586987266ff9862545d (diff) | |
parent | bedf952bb80ae26427854dcde56c139ecb87d4a0 (diff) | |
download | ffmpeg-2951b7fb1d3be236312e27a6dd6dc1dcfc467841.tar.gz |
Merge commit 'bedf952bb80ae26427854dcde56c139ecb87d4a0'
* commit 'bedf952bb80ae26427854dcde56c139ecb87d4a0':
mpegvideo: move setting encoding-only vars from common_defaults() to encode_defaults()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/pthread.c')
0 files changed, 0 insertions, 0 deletions