• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 27fbe31c
    Michael Niedermayer authored
    * qatar/master:
      Revert "avconv: use stream copy by default when possible."
      avconv: print stream copy information.
      avconv: use stream copy by default when possible.
      matroskaenc: vertical alignment.
      matroskaenc: implement query_codec()
      lavf: add avformat_query_codec().
      lavc: add avcodec_get_type() for mapping codec_id -> type.
      flvenc: use int64_t to store offsets
      avconv: don't segfault on 0 input files.
      Do not write ID3v1 tags by default
      mpegts: log into an AVFormatContext rather than MpegTSContext.
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/version.h
    	libavformat/avformat.h
    	libavformat/mp3enc.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    27fbe31c
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...