generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2012-01-17 01:40:45 +01:00
parent 905c4dc2b0 9e12002f11
commit 67f5650a78
25 changed files with 1602 additions and 751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/APIchanges
View File

@@ -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.