diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 16:24:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 18:19:58 +0200 |
| commit | 2b37864e7f2bb78fd78904074f03449f70331e3d (patch) | |
| tree | e69100e9ec952178637e8569796735921fe3388d /tests/ref/fate/creatureshock-avs | |
| parent | 18255441dd74e0bde4fbc8f2f6a1a356fc14df6e (diff) | |
| parent | 2d6e58497e76836604364b037df9b00ba3d75b69 (diff) | |
| download | ffmpeg-2b37864e7f2bb78fd78904074f03449f70331e3d.tar.gz | |
Merge commit '2d6e58497e76836604364b037df9b00ba3d75b69'
* commit '2d6e58497e76836604364b037df9b00ba3d75b69':
lavf: switch to AVCodecContext.framerate for demuxing
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/creatureshock-avs')
0 files changed, 0 insertions, 0 deletions