1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavformat
Michael Niedermayer c7fae9081d Merge commit '93370d12164236d59645314871a1d6808b2a8ddb'
* commit '93370d12164236d59645314871a1d6808b2a8ddb':
  mxfdec: set audio timebase to 1/samplerate

Conflicts:
	libavformat/mxfdec.c
	tests/ref/fate/mxf-demux
	tests/ref/seek/lavf-mxf
	tests/ref/seek/lavf-mxf_d10

See: 83cab07a4c7f8ee1521c49e387b7d86de78d1955
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-30 02:12:42 +02:00
..
2013-05-10 16:10:52 -03:00
2013-06-09 01:10:36 +02:00
2013-06-09 01:10:36 +02:00
2013-09-19 22:04:34 +02:00
2013-06-28 09:04:16 +02:00
2013-08-29 01:57:38 +02:00
2013-04-20 00:05:35 +02:00
2013-06-29 18:02:37 +02:00
2013-09-03 19:34:04 +02:00
2013-06-20 21:49:02 +02:00
2013-09-18 14:10:05 -04:00
2013-09-21 15:36:33 +02:00
2013-05-24 15:36:54 +02:00
2013-07-02 18:52:45 +02:00
2013-09-21 03:26:54 +02:00
2013-09-21 03:26:54 +02:00
2013-06-15 18:50:11 -03:00
2013-07-07 18:50:03 +02:00
2013-09-21 15:36:33 +02:00
2013-09-08 12:54:49 +02:00
2013-05-23 14:46:01 +02:00
2013-09-21 15:36:33 +02:00
2013-05-01 11:56:34 +02:00
2013-08-23 20:05:35 +02:00
2013-09-15 22:03:03 -04:00
2013-05-18 07:12:56 +02:00
2013-05-10 16:53:50 -03:00
2013-09-21 15:36:33 +02:00
2013-05-26 15:48:50 +02:00
2013-08-05 10:14:42 +02:00
2013-06-16 18:56:56 +00:00
2013-08-21 05:51:41 +02:00
2013-05-29 18:14:43 +00:00
2013-09-21 15:36:33 +02:00