• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · ba57ef29
    Michael Niedermayer authored
    * qatar/master:
      avconv: Fix spelling errors.
      aac: Only set sample rate and object type from ADTS if output hasn't been configured.
      aac: Set SBR and PS to unsignalled during headerless and ADTS initialization.
      aac: Only output configure if audio was found.
      avconv: save two levels of indentation in flush_encoders()
      avconv: factor flushing encoders out of output_packet().
      avconv: factor out initializing input streams.
      avconv: remove -intra option.
      avconv: reset streamid_map between output files.
      avconv: make timer_start a local var in transcode().
      avconv: cosmetics, move OutputStream.
      avconv: remove two unused macros.
    
    Conflicts:
    	avconv.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    ba57ef29
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...