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

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