diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 13:53:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 13:53:08 +0200 |
| commit | 22dc25cb29ab7b84d6d03f56766a15b6556a7b11 (patch) | |
| tree | 2baa43c1842984e04e46dd28dcc09b19bf0c7455 /ffmpeg_opt.c | |
| parent | 6537827189153cd1c6944403a48d7ff76f7b8228 (diff) | |
| parent | b4a5a292274f904f404f40f826c51e6fc9cfb8fe (diff) | |
| download | android_external_ffmpeg-22dc25cb29ab7b84d6d03f56766a15b6556a7b11.tar.gz android_external_ffmpeg-22dc25cb29ab7b84d6d03f56766a15b6556a7b11.tar.bz2 android_external_ffmpeg-22dc25cb29ab7b84d6d03f56766a15b6556a7b11.zip | |
Merge commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe'
* commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe':
avconv: improve -re implementation
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions