aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/oma.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-30 02:03:33 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-30 02:12:42 +0200
commitc7fae9081dfd6196031673d0e90b459351455223 (patch)
tree9c45608af36b330ca8654b1819a0eadbd969b8f1 /libavformat/oma.c
parentbbe50a8001ade24618685f6cacefc5d49a2e003c (diff)
parent93370d12164236d59645314871a1d6808b2a8ddb (diff)
downloadffmpeg-c7fae9081dfd6196031673d0e90b459351455223.tar.gz
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>
Diffstat (limited to 'libavformat/oma.c')
0 files changed, 0 insertions, 0 deletions