diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-17 01:40:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-17 02:37:30 +0100 |
| commit | 67f5650a78de2567c58dbd7545434cc6d3ef9b7e (patch) | |
| tree | 34b08ed769cd7a1f071bf9ff4eca1348481c0bf1 /libavformat/aea.c | |
| parent | 905c4dc2b0d564e1b9b6bc6eeca0b8915b81cd8c (diff) | |
| parent | 9e12002f114d7e0b0ef69519518cdc0391e5e198 (diff) | |
| download | ffmpeg-67f5650a78de2567c58dbd7545434cc6d3ef9b7e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rv34: add NEON rv34_idct_add
rv34: 1-pass inter MB reconstruction
add SMJPEG muxer
avformat: split out common SMJPEG code
pictordec: Use bytestream2 functions
avconv: use avcodec_encode_audio2()
pcmenc: use AVCodec.encode2()
avcodec: bump minor version and add APIChanges for the new audio encoding API
avcodec: Add avcodec_encode_audio2() as replacement for avcodec_encode_audio()
avcodec: add a public function, avcodec_fill_audio_frame().
rv34: Intra 16x16 handling
rv34: Inter/intra MB code split
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/pictordec.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/x86/rv34dsp.asm
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aea.c')
0 files changed, 0 insertions, 0 deletions