diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-30 12:03:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-30 12:03:12 +0200 |
| commit | 000f8bcd0360b7c81ed62e89e335a48777ab44c0 (patch) | |
| tree | d584956e9ad00dac142ee0a54665d6b951101377 /libavformat/ffmetaenc.c | |
| parent | 870f506cfeec6338be77d945ebecc4cfd75353aa (diff) | |
| parent | 78b4bfdb84b7c909f7b97c87de17f59e36c50559 (diff) | |
| download | ffmpeg-000f8bcd0360b7c81ed62e89e335a48777ab44c0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Replace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalents
Conflicts:
libavcodec/g2meet.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ffmetaenc.c')
0 files changed, 0 insertions, 0 deletions