Merge commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Feb 2015 21:03:54 +0000 (22:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Feb 2015 21:03:54 +0000 (22:03 +0100)
commitdc6eadaa458aa2e3ce407459b37e8f8403e455b4
tree0dfb795170c80f4573686bed495fe0898cb746d4
parentd19ca4b2eae2d4c9170dfa559472e26730fca4a3
parent46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7
Merge commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7'

* commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7':
  rtpdec_h264: Move a leftover comment into h264_handle_packet_stap_a

Conflicts:
libavformat/rtpdec_h264.c

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