ffmpeg/libavformat
Michael Niedermayer 67f5650a78 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>
2012-01-17 02:37:30 +01:00
..
2011-12-12 20:21:47 +01:00
2012-01-16 03:43:32 +01:00
2011-11-05 16:51:25 +01:00
2012-01-14 19:25:08 +01:00
2011-12-13 20:01:49 +01:00
2011-12-19 11:57:34 +01:00
2011-12-13 21:08:43 +01:00
2011-11-30 20:34:45 +01:00
2011-08-01 00:58:49 +02:00
2011-12-30 20:00:53 +01:00
2011-12-30 20:00:53 +01:00
2011-08-09 19:56:25 +02:00
2011-12-30 20:00:53 +01:00
2011-11-03 20:21:01 +01:00
2011-12-29 15:25:07 +01:00
2011-12-30 20:00:53 +01:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2011-12-31 02:27:11 +01:00
2011-08-09 19:56:25 +02:00
2012-01-16 19:21:24 +01:00
2011-12-30 01:44:47 +01:00
2011-12-20 22:38:53 +01:00
2011-12-18 16:23:16 +01:00
2012-01-09 11:02:21 +01:00
2011-12-18 23:54:56 +01:00
2011-11-30 17:39:32 +02:00
2012-01-16 11:29:55 +01:00
2011-12-19 19:11:49 +01:00
2011-12-16 06:02:14 +01:00
2012-01-07 09:59:15 -05:00
2012-01-14 17:14:18 +01:00
2011-12-30 20:00:53 +01:00
2011-12-30 20:00:53 +01:00