diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 13:40:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 13:58:55 +0200 |
| commit | 60ef0c6f909703ae4dc021f6857d254c7badc1ec (patch) | |
| tree | f03160a80bdb19f4448dcd31fdfc4a8e2aa22d89 /libavcodec/intrax8.h | |
| parent | c740e083bc46f5380367627852a262f049a5e717 (diff) | |
| parent | 60fd7d36c47d62d4c603bf16c213b1a924f5cfcf (diff) | |
| download | ffmpeg-60ef0c6f909703ae4dc021f6857d254c7badc1ec.tar.gz | |
Merge commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf'
* commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf':
fate: correctly set sample rate for mp2 tests
Conflicts:
tests/fate/acodec.mak
tests/lavf-regression.sh
one hunk has been ommited as it breaks fate
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/intrax8.h')
0 files changed, 0 insertions, 0 deletions