RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-13 02:34:54 +00:00
Code Issues Projects Releases Wiki Activity
99eb31e263
ffmpeg/tools
History
Michael Niedermayer f8ae3a2108 Merge remote branch 'qatar/master' 
12 files changed, 36 insertions(+), 81 deletions(-)
yes thats 36 new lines in 14 commits

* qatar/master:
  ffmpeg: fix -aspect cli option
  Restructure video filter implementation in ffmpeg.c.
  ffplay: remove audio_write_get_buf_size() forward declaration
  lavfi: print key-frame and picture type information in ff_dlog_ref()
  mathops: remove ancient confusing comment
  cws2fws: Improve error message wording.
  tools: Check the return value of write().
  mpegaudio: move OUT_FMT macro to mpegaudiodec.c
  mpegaudio: remove OUT_MIN/MAX macros
  Add missing #includes to mp3_header_(de)compress bsf
  dct: fix indentation
  dct: bypass table allocation for DCT_II of size 32
  h264dsp_mmx: Add #ifdefs around some mmxext functions on x86_64.
  Remove unused header mpegaudio3.h.

Conflicts:
	ffmpeg.c
	libavcodec/mpegaudio.h
	libavcodec/mpegaudio3.h
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-17 04:51:33 +02:00
..
build_avopt
clean-diff Replace `` by $() syntax in shell scripts. 2011-04-23 17:45:05 +02:00
cws2fws.c cws2fws: Improve error message wording. 2011-05-16 20:56:56 +02:00
graph2dot.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
jauche_sortierer.sh
lavfi-showfiltfmts.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
patcheck patcheck: warn about assert usage 2011-05-12 13:02:58 +02:00
pktdumper.c Merge remote branch 'qatar/master' 2011-05-17 04:51:33 +02:00
probetest.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
qt-faststart.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
trasher.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
unwrap-diff