diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 12:49:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 12:49:36 +0200 |
| commit | 065996b9843b6366bab23d0c6adc61c05c0f9f75 (patch) | |
| tree | a14a67fa5ddf00dbf4a100298f54abf3b7dc67de /libavresample/utils.c | |
| parent | 1ace588f4a94fa607a42971b59483447647c4727 (diff) | |
| parent | 05015d03da1d745bb92915b5cea92dec16af719f (diff) | |
| download | ffmpeg-065996b9843b6366bab23d0c6adc61c05c0f9f75.tar.gz | |
Merge commit '05015d03da1d745bb92915b5cea92dec16af719f' into release/1.1
* commit '05015d03da1d745bb92915b5cea92dec16af719f':
matroska: fix a corner case in ebml-lace parsing
avfiltergraph: check for sws opts being non-NULL before using them.
configure: Enable hwaccels without external dependencies by default.
oma: Validate sample rates
Conflicts:
libavfilter/avfiltergraph.c
libavfilter/graphparser.c
libavformat/oma.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/utils.c')
0 files changed, 0 insertions, 0 deletions