diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 18:30:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 18:30:47 +0200 |
| commit | 0a8f5eb23a2d95f2bab6a0e7e19cc838d99fcdf1 (patch) | |
| tree | 5602f50fe193e3307a6ae8320fc478533ebe3a06 /presets/libx264-ipod640.ffpreset | |
| parent | 508a5349da9869382803445f8e380751ec43021e (diff) | |
| parent | 255d9c570e117f0fcb8e51fa2c5996f3c4b2052b (diff) | |
| download | ffmpeg-0a8f5eb23a2d95f2bab6a0e7e19cc838d99fcdf1.tar.gz | |
Merge commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b'
* commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b':
riff: Move demuxing code to a separate file.
Conflicts:
configure
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets/libx264-ipod640.ffpreset')
0 files changed, 0 insertions, 0 deletions