• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 41bf67d8
    Michael Niedermayer authored
    * qatar/master:
      movenc: change AV_LOG_INFO to AV_LOG_WARNING for some warnings
      avconv: remove a write-only variable
      avconv: remove pointless parameter from new_*_stream().
      avconv: cosmetics, move code
      avconv: cosmetics -- move copy_chapters().
      avconv: cosmetics -- move parse_forced_key_frames().
      lavc: add audio flag to the 'b' option, deprecate 'ab'.
      avconv: rename sameq to same_quant
      doc/avconv: add forgotten end of chapter.
      Changelog: document avconv incompatibilities with ffmpeg.
      avconv: replace -vcodec/-acodec/-scodec with a better system.
      avconv: remove presets.
      svq3: propagate codec memory allocation failure in context init
    
    Conflicts:
    	Changelog
    	avconv.c
    	libavcodec/options.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    41bf67d8
Name
Last commit
Last update
doc Loading commit data...
ffpresets Loading commit data...
libavcodec Loading commit data...
libavdevice Loading commit data...
libavfilter Loading commit data...
libavformat Loading commit data...
libavutil Loading commit data...
libpostproc Loading commit data...
libswscale Loading commit data...
mt-work Loading commit data...
tests Loading commit data...
tools Loading commit data...
.gitignore Loading commit data...
COPYING.GPLv2 Loading commit data...
COPYING.GPLv3 Loading commit data...
COPYING.LGPLv2.1 Loading commit data...
COPYING.LGPLv3 Loading commit data...
CREDITS Loading commit data...
Changelog Loading commit data...
Doxyfile Loading commit data...
INSTALL Loading commit data...
LICENSE Loading commit data...
MAINTAINERS Loading commit data...
Makefile Loading commit data...
README Loading commit data...
RELEASE Loading commit data...
avconv.c Loading commit data...
cmdutils.c Loading commit data...
cmdutils.h Loading commit data...
cmdutils_common_opts.h Loading commit data...
common.mak Loading commit data...
configure Loading commit data...
ffmpeg.c Loading commit data...
ffplay.c Loading commit data...
ffprobe.c Loading commit data...
ffserver.c Loading commit data...
subdir.mak Loading commit data...
version.sh Loading commit data...