« Previous | Next » 

Revision f8ae3a21

IDf8ae3a2108b612776e886d927b4a7289dde619f1
Parent e6e7ba0c, 901ff511
Child 34b92dbd

Added by Michael Niedermayer over 9 years ago

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 <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted