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)
* commit '176903ce833ce7469f411640e9748a0d549b5285':
  rtpdec_h264: Return immediately on errors in h264_handle_packet_stap_a

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

Simple merge