Merge commit '176903ce833ce7469f411640e9748a0d549b5285'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Feb 2015 20:48:14 +0000 (21:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Feb 2015 20:48:32 +0000 (21:48 +0100)
commitac7128a90f53c2ff6f49a2af50bd227df472daca
treebb006f2f80ebcbb7a796ae03cea93deeeef21ca1
parent48e661b30b94b3a0f4f635a8a6005619c4e51eb0
parent176903ce833ce7469f411640e9748a0d549b5285
Merge commit '176903ce833ce7469f411640e9748a0d549b5285'

* commit '176903ce833ce7469f411640e9748a0d549b5285':
  rtpdec_h264: Return immediately on errors in h264_handle_packet_stap_a

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtpdec_h264.c