FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00

Files

Michael Niedermayer 7d8f115843 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegenc: use avctx->slices as number of slices
  v410enc: fix undefined signed left shift caused by integer promotion
  Release notes: mention cleaned up header includes
  fix Changelog file
  Fix a bunch of typos.
  Drop some pointless void* return value casts from av_malloc() invocations.
  wavpack: fix typos in previous cosmetic clean-up commit
  wavpack: cosmetics: K&R pretty-printing
  avconv: remove the 'codec framerate is different from stream' warning
  wavpack: determine sample_fmt before requesting a buffer
  bmv audio: implement new audio decoding API
  mpegaudiodec: skip all channels when skipping granules
  mpegenc: simplify muxrate calculation

Conflicts:
	Changelog
	avconv.c
	doc/RELEASE_NOTES
	libavcodec/h264.c
	libavcodec/mpeg12.c
	libavcodec/mpegaudiodec.c
	libavcodec/mpegvideo.c
	libavformat/mpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-01-03 03:06:45 +01:00

build_libstagefright

Merge remote-tracking branch 'hexene/stagefright'

2011-10-13 18:04:02 +02:00

clean-diff

Remove some unused scripts from tools/.

2011-06-06 01:31:02 +02:00

cws2fws.c

tests/tools/examples: Replace direct exit() calls by return.

2011-12-08 01:00:58 +01:00

enum_options.c

tools: add a tool for enumerating/printing AVOptions in texinfo format