Merge commit 'f3449062a8d100ac4f703647336c32b126aa99f1'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 22:16:46 +0000 (23:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 22:16:46 +0000 (23:16 +0100)
commit0f8de2b5f17b051d2cfdf1ba25c2990368df1a27
tree4438a82889b809460b9b94bae1740ce0cefb0ef1
parent29f9d82d23ffc4e48c220c68c7041ca581632981
parentf3449062a8d100ac4f703647336c32b126aa99f1
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>
libavformat/rtpdec_hevc.c