• 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
..
ac3_ac3 Loading commit data...
adpcm_ima_wav Loading commit data...
adpcm_ms_wav Loading commit data...
adpcm_qt_aiff Loading commit data...
adpcm_swf_flv Loading commit data...
adpcm_yam_wav Loading commit data...
alac_m4a Loading commit data...
asv1_avi Loading commit data...
asv2_avi Loading commit data...
dnxhd_1080i_mov Loading commit data...
dnxhd_720p_dnxhd Loading commit data...
dnxhd_720p_rd_dnxhd Loading commit data...
dv411_dv Loading commit data...
dv50_dv Loading commit data...
dv_dv Loading commit data...
error_mpeg4_adv_avi Loading commit data...
ffv1_avi Loading commit data...
flac_flac Loading commit data...
flashsv_flv Loading commit data...
flv_flv Loading commit data...
g726_wav Loading commit data...
h261_avi Loading commit data...
h263_avi Loading commit data...
h263p_avi Loading commit data...
huffyuv_avi Loading commit data...
image_bmp Loading commit data...
image_jpg Loading commit data...
image_pcx Loading commit data...
image_pgm Loading commit data...
image_ppm Loading commit data...
image_sgi Loading commit data...
image_tga Loading commit data...
image_tiff Loading commit data...
jpegls_avi Loading commit data...
lavf_aif Loading commit data...
lavf_al Loading commit data...
lavf_asf Loading commit data...
lavf_au Loading commit data...
lavf_avi Loading commit data...
lavf_dv Loading commit data...
lavf_ffm Loading commit data...
lavf_flv Loading commit data...
lavf_gif Loading commit data...
lavf_gxf Loading commit data...
lavf_mkv Loading commit data...
lavf_mmf Loading commit data...
lavf_mov Loading commit data...
lavf_mpg Loading commit data...
lavf_mxf Loading commit data...
lavf_mxf_d10 Loading commit data...
lavf_nut Loading commit data...
lavf_ogg Loading commit data...
lavf_rm Loading commit data...
lavf_swf Loading commit data...
lavf_ts Loading commit data...
lavf_ul Loading commit data...
lavf_voc Loading commit data...
lavf_wav Loading commit data...
lavf_wtv Loading commit data...
lavf_y4m Loading commit data...
ljpeg_avi Loading commit data...
mjpeg_avi Loading commit data...
mp2_mp2 Loading commit data...
mpeg1_mpg Loading commit data...
mpeg1b_mpg Loading commit data...
mpeg2_422_mpg Loading commit data...
mpeg2_idct_int_mpg Loading commit data...
mpeg2i_mpg Loading commit data...
mpeg2ivlc_qprd_mpg Loading commit data...
mpeg2reuse_mpg Loading commit data...
mpeg2thread_mpg Loading commit data...
mpeg2threadivlc_mpg Loading commit data...
mpeg4_Q_avi Loading commit data...
mpeg4_adap_avi Loading commit data...
mpeg4_adv_avi Loading commit data...
mpeg4_nr_avi Loading commit data...
mpeg4_qprd_avi Loading commit data...
mpeg4_rc_avi Loading commit data...
mpeg4_thread_avi Loading commit data...
msmpeg4_avi Loading commit data...
msmpeg4v2_avi Loading commit data...
odivx_mp4 Loading commit data...
pbmpipe_pbm Loading commit data...
pcm_alaw_wav Loading commit data...
pcm_f32be_au Loading commit data...
pcm_f32le_wav Loading commit data...
pcm_f64be_au Loading commit data...
pcm_f64le_wav Loading commit data...
pcm_mulaw_wav Loading commit data...
pcm_s16be_mov Loading commit data...
pcm_s16le_wav Loading commit data...
pcm_s24be_mov Loading commit data...
pcm_s24daud_302 Loading commit data...
pcm_s24le_wav Loading commit data...
pcm_s32be_mov Loading commit data...
pcm_s32le_wav Loading commit data...
pcm_s8_mov Loading commit data...
pcm_u8_wav Loading commit data...
pgmpipe_pgm Loading commit data...
ppmpipe_ppm Loading commit data...
rgb_avi Loading commit data...
roqav_roq Loading commit data...
rv10_rm Loading commit data...
rv20_rm Loading commit data...
snow53_avi Loading commit data...
snow_avi Loading commit data...
svq1_mov Loading commit data...
wmav1_asf Loading commit data...
wmav2_asf Loading commit data...
wmv1_avi Loading commit data...
wmv2_avi Loading commit data...
yuv_avi Loading commit data...