diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:56:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:56:43 +0100 |
| commit | f45fdb123f39bf7341731aa2e381d7f0f623db70 (patch) | |
| tree | 30dee0ff7ecf82deb9e1e838bd189804dd2c051d /libavformat/soxenc.c | |
| parent | b2e0c9dd34f5f4b75624770e6080170508c1f1f4 (diff) | |
| parent | 19cac8e301419dcde31526d15196a952ddf2c4c7 (diff) | |
| download | ffmpeg-f45fdb123f39bf7341731aa2e381d7f0f623db70.tar.gz | |
Merge commit '19cac8e301419dcde31526d15196a952ddf2c4c7'
* commit '19cac8e301419dcde31526d15196a952ddf2c4c7':
mpegvideo: remove useless references to h264 and svq3
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/soxenc.c')
0 files changed, 0 insertions, 0 deletions