diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 23:16:46 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 23:16:46 +0100 |
commit | 0f8de2b5f17b051d2cfdf1ba25c2990368df1a27 (patch) | |
tree | 4438a82889b809460b9b94bae1740ce0cefb0ef1 /libswresample/x86/audio_convert.asm | |
parent | 29f9d82d23ffc4e48c220c68c7041ca581632981 (diff) | |
parent | f3449062a8d100ac4f703647336c32b126aa99f1 (diff) | |
download | ffmpeg-0f8de2b5f17b051d2cfdf1ba25c2990368df1a27.tar.gz |
Merge commit 'f3449062a8d100ac4f703647336c32b126aa99f1'
* commit 'f3449062a8d100ac4f703647336c32b126aa99f1':
rtpdec_hevc: Reduce indentation level by returning early on errors
Conflicts:
libavformat/rtpdec_hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/x86/audio_convert.asm')
0 files changed, 0 insertions, 0 deletions