diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 02:12:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 02:12:59 +0100 |
| commit | 20b28fc7b0aaa41c1837bf234e599d1714bc4d35 (patch) | |
| tree | 7374533b7fffbacf2225c62569e82047273612ca /libavfilter/af_channelmap.c | |
| parent | 2951b7fb1d3be236312e27a6dd6dc1dcfc467841 (diff) | |
| parent | 1f8eb69079880ef1f394c498dfdf471f91222a06 (diff) | |
| download | ffmpeg-20b28fc7b0aaa41c1837bf234e599d1714bc4d35.tar.gz | |
Merge commit '1f8eb69079880ef1f394c498dfdf471f91222a06'
* commit '1f8eb69079880ef1f394c498dfdf471f91222a06':
mpegvideo: move encoding-only initialization from common_init() to encode_init()
Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_channelmap.c')
0 files changed, 0 insertions, 0 deletions