1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
FFmpeg/libavcodec
Michael Niedermayer 7ed9ec033f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  dwt: Drop unused functions spatial_compose{53|97}i()
  nutdec: Remove unused and broken debug function stub
  avcodec: Drop long-deprecated imgconvert.h header
  Add Opus support to the Ogg muxer.
  Add Opus codec id and codec description.
  avformat: Identify anonymous AVIO typedef structs.

Conflicts:
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/imgconvert.h
	libavcodec/version.h
	libavformat/oggenc.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-28 05:11:19 +02:00
..
2012-09-04 04:38:28 +02:00
2012-08-09 00:02:05 +00:00
2012-08-15 22:32:06 +03:00
2012-09-23 15:24:08 +02:00
2012-09-01 15:23:39 +02:00
2012-09-21 01:03:31 +02:00
2012-09-15 04:06:32 +02:00
2012-08-14 18:58:49 +02:00
2012-09-11 07:13:49 +02:00
2012-08-07 23:57:21 +02:00
2012-09-25 18:10:11 +02:00
2012-08-27 18:31:21 +02:00
2012-08-25 03:55:50 +02:00
2012-08-15 22:32:06 +03:00
2012-09-04 18:37:54 +03:00
2012-08-15 22:32:06 +03:00
2012-09-07 12:36:00 +02:00
2012-07-26 16:33:17 +02:00
2012-08-13 04:58:15 +02:00
2012-09-09 13:02:08 +02:00
2012-07-22 05:18:01 +02:00
2012-09-26 01:56:01 +02:00
2012-09-03 23:26:14 +02:00
2012-09-23 15:24:08 +02:00
2012-09-03 23:23:40 +02:00
2012-08-15 05:29:28 +02:00
2012-09-15 22:13:21 +02:00
2012-07-29 22:02:46 +02:00
2012-09-23 21:12:23 +02:00
2012-09-10 21:04:01 +02:00
2012-08-15 22:32:06 +03:00
2012-08-12 05:32:07 +02:00
2012-09-03 01:26:57 +02:00
2012-09-18 17:37:41 +02:00
2012-09-19 11:05:36 -07:00
2012-08-18 09:52:15 +02:00
2012-08-28 04:07:53 +02:00
2012-09-23 15:24:08 +02:00