diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-18 15:00:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-18 15:00:05 +0100 |
| commit | 5c2fc3bdd7f6da1c12f731419cd60037e9c3c2a4 (patch) | |
| tree | 1a966b26141c8815e0ae89153ce8d4c828d51728 /libavfilter/af_apad.c | |
| parent | 14f79ba18f263a746f91dbd80f4d109fb16105ca (diff) | |
| parent | ea061af15ac5629dc8dbeb33b7382d6711a323c3 (diff) | |
| download | ffmpeg-5c2fc3bdd7f6da1c12f731419cd60037e9c3c2a4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: formatting cosmetics
h264: use mbaff ref indices in fill_colmap() only for mbaff references
Conflicts:
libavcodec/h264_direct.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_apad.c')
0 files changed, 0 insertions, 0 deletions