• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 15c6be8c
    Michael Niedermayer authored
    * qatar/master:
      tiertexseq: set correct block_align for audio
      tiertexseq: set audio stream start time to 0
      voc/avs: Do not change the sample rate mid-stream.
      segafilm: use the sample rate as the time base for audio streams
      ea: fix audio pts
      psx-str: fix audio pts
      vqf: set packet duration
      tta demuxer: set packet duration
      mpegaudio_parser: do not ignore information from the first parsed frame
      mpegaudio_parser: be less picky about the start position
      thp: set audio packet durations
      avcodec: add a Vorbis parser to get packet duration
      vorbisdec: read the previous window flag for long windows
      lavc: free the output packet when encoding failed or produced no output.
      lavc: preserve avpkt->destruct in ff_alloc_packet().
      lavc: clarify the meaning of AVCodecContext.frame_number.
      mpegts: Pad the packet buffer in handle_packet().
      mpegts: Do not call read_sl_header() when no bytes remain in the buffer.
    
    Conflicts:
    	libavcodec/mpegaudio_parser.c
    	libavcodec/version.h
    	libavformat/mpegts.c
    	tests/ref/fate/pva-demux
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    15c6be8c
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...
libswresample Loading commit data...
libswscale Loading commit data...
mt-work Loading commit data...
presets 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...
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...
library.mak Loading commit data...
version.sh Loading commit data...