1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
FFmpeg/libavcodec
Michael Niedermayer 15c6be8c7d Merge remote-tracking branch 'qatar/master'
* 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: Michael Niedermayer <michaelni@gmx.at>
2012-03-04 04:26:04 +01:00
..
2012-03-03 04:35:15 +01:00
2012-02-20 15:08:41 -05:00
2012-02-29 21:18:54 +01:00
2012-01-28 21:59:01 +01:00
2012-02-24 03:30:42 +01:00
2012-02-02 18:44:52 +01:00
2012-03-02 18:58:19 +02:00
2012-03-02 18:58:19 +02:00
2012-02-20 15:08:41 -05:00
2012-02-01 04:43:06 +01:00
2012-01-26 19:54:38 +01:00
2012-02-14 01:22:38 +01:00
2012-02-24 04:12:40 +01:00
2012-02-14 01:22:38 +01:00
2012-03-03 04:14:37 +01:00
2012-02-07 18:28:00 +01:00
2012-02-18 02:31:38 +01:00
2012-03-01 16:16:13 +01:00
2012-03-01 16:16:13 +01:00
2012-02-24 04:13:01 +01:00
2012-03-03 23:55:16 +01:00
2012-03-03 03:50:05 +01:00
2012-02-14 19:03:10 +01:00
2012-02-16 06:25:32 +01:00
2012-03-02 20:53:00 +01:00
2012-02-23 23:38:20 +01:00
2012-02-23 23:42:04 +01:00
2012-03-02 08:26:36 +01:00
2012-01-23 19:04:35 +01:00
2012-01-23 19:04:35 +01:00
2012-02-25 07:45:06 +01:00
2012-03-04 00:13:52 +01:00
2012-02-23 23:40:51 +01:00
2012-02-04 01:12:04 +01:00