1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavformat
Michael Niedermayer 8f0768cc22 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Add a tool that uses avio to read and write, doing a plain copy of data
  ARM: fix build with FFT enabled and MDCT disabled
  lavf: force single-threaded decoding in avformat_find_stream_info
  avidec: migrate last of lavf from FF_ER_* to AV_EF_*
  avserver: fix build after the next bump.

Conflicts:
	libavformat/Makefile
	libavformat/avidec.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-21 01:33:31 +01:00
..
2012-01-16 03:43:32 +01:00
2011-12-30 20:00:53 +01:00
2011-12-30 20:00:53 +01:00
2011-12-30 20:00:53 +01:00
2011-12-29 15:25:07 +01:00
2011-12-30 20:00:53 +01:00
2011-12-31 02:27:11 +01:00
2011-12-30 01:44:47 +01:00
2012-01-09 11:02:21 +01:00
2012-01-19 17:20:50 +01:00
2012-01-18 16:37:00 +01:00
2012-01-18 16:36:38 +01:00
2012-01-16 11:29:55 +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