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 /doc | |
| 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 'doc')
| -rw-r--r-- | doc/APIchanges | 8 | ||||
| -rw-r--r-- | doc/general.texi | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 3b3da66eee..4dfd6e02af 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,14 @@ libavutil: 2011-04-18 API changes, most recent first: +2012-xx-xx - lavc 53.34.0 + New audio encoding API: + xxxxxxx Add CODEC_CAP_VARIABLE_FRAME_SIZE capability for use by audio + encoders. + xxxxxxx Add avcodec_fill_audio_frame() as a convenience function. + xxxxxxx Add avcodec_encode_audio2() and deprecate avcodec_encode_audio(). + Add AVCodec.encode2(). + 2012-01-xx - xxxxxxx - lavfi 2.15.0 Add a new installed header -- libavfilter/version.h -- with version macros. diff --git a/doc/general.texi b/doc/general.texi index 2f18e4c126..b5847c9581 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -317,7 +317,7 @@ library: @tab Used in Sierra CD-ROM games. @item Smacker @tab @tab X @tab Multimedia format used by many games. -@item SMJPEG @tab @tab X +@item SMJPEG @tab X @tab X @tab Used in certain Loki game ports. @item Sony OpenMG (OMA) @tab X @tab X @tab Audio format used in Sony Sonic Stage and Sony Vegas. |