diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-09 10:29:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-09 10:29:51 +0100 |
| commit | 1b5a6d3c4966fb67d79445aca9c1ad6c1ecbdd4b (patch) | |
| tree | c9ba394ee683ee33501a52b655542087c9d76071 /libavfilter/af_aresample.c | |
| parent | 769354348a3acddb36582277a7d3f26e6d179369 (diff) | |
| parent | 3a2731cbd31d0c5681ddbc7c78edd5c53c4d0032 (diff) | |
| download | ffmpeg-1b5a6d3c4966fb67d79445aca9c1ad6c1ecbdd4b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
flacenc: ensure the order is within the min/max range in LPC order search
avconv: rescale packet duration to muxer time base when flushing encoders
add 24-bit FLAC encoding to Changelog
rtpenc_aac: Fix calculation of the header size
x86: h264_intrapred: port to cpuflags
Conflicts:
Changelog
libavformat/rtpenc_aac.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_aresample.c')
0 files changed, 0 insertions, 0 deletions