1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00
FFmpeg/libavcodec
Michael Niedermayer e052f06531 Merge commit '0f24a3ca999a702f83af9307f9f47b6fdeb546a5'
* commit '0f24a3ca999a702f83af9307f9f47b6fdeb546a5':
  lavc: remove disabled FF_API_OLD_ENCODE_VIDEO cruft
  lavc: remove disabled FF_API_OLD_ENCODE_AUDIO cruft
  lavc: remove disabled FF_API_OLD_DECODE_AUDIO cruft

Conflicts:
	libavcodec/flacenc.c
	libavcodec/libgsm.c
	libavcodec/utils.c
	libavcodec/version.h

The compatibility wrapers are left as they likely sre still
in wide use. They will be removed when they break or otherwise
cause work without an volunteer being available.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 22:04:16 +01:00
..
2013-02-21 23:06:30 +01:00
2013-03-12 19:56:58 +01:00
2013-03-06 22:11:46 +01:00
2013-01-21 10:24:45 +00:00
2013-03-06 22:11:46 +01:00
2013-01-14 22:59:05 +01:00
2013-01-14 22:59:05 +01:00
2013-01-09 01:08:39 +01:00
2012-12-21 00:18:34 +01:00
2013-01-21 10:24:45 +00:00
2012-12-05 19:31:27 +01:00
2013-03-12 18:24:49 +01:00
2013-03-06 10:31:56 +00:00
2013-03-02 20:39:38 +01:00
2012-12-08 01:13:07 +00:00
2012-12-08 01:13:07 +00:00
2013-03-12 19:56:58 +01:00
2012-12-31 00:41:35 +01:00
2013-01-23 19:39:42 +01:00
2013-01-23 19:39:42 +01:00
2013-03-05 03:29:04 +01:00
2013-03-12 12:17:58 +01:00
2013-01-24 01:47:20 +01:00
2013-01-06 16:30:02 +01:00
2013-02-03 13:08:36 +01:00
2013-03-12 18:10:09 +01:00
2013-01-12 14:06:30 +01:00
2013-02-09 14:22:29 +01:00
2013-01-14 22:59:05 +01:00
2013-01-14 22:59:05 +01:00
2013-03-12 10:35:51 +01:00
2013-01-06 16:30:02 +01:00
2012-12-09 22:01:00 +00:00
2012-12-09 22:01:00 +00:00
2012-12-09 22:01:00 +00:00
2013-03-12 19:56:58 +01:00
2012-12-22 00:58:08 +01:00
2012-12-22 00:58:08 +01:00
2013-03-12 21:46:38 +01:00