diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 00:22:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 00:22:25 +0200 |
| commit | 81ca7826638e1355b41fdc56583e9929fe1a69e1 (patch) | |
| tree | a514e1817b9412d9afdab8a30dd6c357789c3b8f /libavcodec/proresdsp.c | |
| parent | 51daca6c5776a3f00bfdd618a60dab322a85d7d3 (diff) | |
| parent | 167278f377d8d124c43e525341b78c62bc6b1ed4 (diff) | |
| download | ffmpeg-81ca7826638e1355b41fdc56583e9929fe1a69e1.tar.gz | |
Merge remote-tracking branch 'jamrial/release/1.0' into release/1.0
* jamrial/release/1.0:
avformat/matroskadec: check out_samplerate before using it in av_rescale()
matroskadec: Improve TTA duration calculation
matroskaenc: simplify mkv_check_tag()
lavf/matroskaenc: Check for valid metadata before creating tags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/proresdsp.c')
0 files changed, 0 insertions, 0 deletions