1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavcodec
Michael Niedermayer 99efd59626 Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'
* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967':
  Remove pointless #undefs of previously forbidden functions.
  fate: Add dependencies for bmp, cdxl, dfa, mp3

Conflicts:
	doc/examples/muxing.c
	libavfilter/filtfmts.c
	libavutil/des.c
	libavutil/eval.c
	libavutil/log.c
	libavutil/parseutils.c
	tests/fate/mp3.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-05 13:34:45 +01:00
..
2012-11-26 11:17:17 -05:00
2012-11-24 10:56:47 +00:00
2012-11-24 10:56:47 +00:00
2012-11-30 10:48:37 +00:00
2012-11-24 10:56:47 +00:00
2012-11-24 16:38:22 +01:00
2012-11-25 18:38:12 +01:00
2012-11-23 18:10:02 +01:00
2012-11-23 18:10:02 +01:00
2012-11-23 15:52:12 +01:00
2012-11-17 20:28:52 +00:00
2012-11-23 02:42:00 +01:00
2012-11-30 15:00:35 +00:00
2012-12-02 16:59:11 +00:00
2012-12-04 20:53:26 +11:00
2012-11-25 22:48:18 +01:00
2012-11-23 18:10:02 +01:00
2012-11-23 18:10:02 +01:00
2012-11-23 18:10:02 +01:00
2012-11-18 17:46:45 +00:00
2012-11-23 01:18:53 +01:00
2012-11-18 17:46:45 +00:00
2012-11-25 18:38:12 +01:00
2012-12-01 02:36:28 +01:00
2012-11-28 16:21:25 +00:00
2012-11-28 05:16:15 +01:00
2012-11-24 16:38:22 +01:00
2012-11-25 18:38:12 +01:00
2012-11-24 10:28:23 +00:00
2012-11-16 05:16:34 +01:00
2012-12-03 15:13:35 +00:00
2012-11-26 21:26:24 +01:00
2012-12-03 15:21:19 +00:00
2012-11-25 22:33:54 +01:00
2012-11-30 05:31:41 +01:00
2012-11-29 23:12:42 +01:00
2012-12-01 22:25:50 +01:00
2012-12-01 10:17:20 +00:00
2012-11-15 20:58:36 +01:00