ffmpeg/tools
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
..
aviocat.c
build_libstagefright
clean-diff
cws2fws.c
enum_options.c
ffeval.c
graph2dot.c
lavfi-showfiltfmts.c
patcheck
pktdumper.c
probetest.c
qt-faststart.c
trasher.c
unwrap-diff