1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavformat
Michael Niedermayer dc6eadaa45 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>
2015-02-20 22:03:54 +01:00
..
2015-02-16 19:59:04 +01:00
2015-01-15 17:09:39 +01:00
2015-01-30 09:33:49 +00:00
2015-02-17 12:16:43 -05:00
2015-02-06 20:44:36 +01:00
2015-02-15 18:20:54 +01:00
2014-12-20 00:17:43 +01:00
2015-01-18 00:36:56 +01:00
2015-02-04 13:10:53 +00:00
2015-02-01 20:00:10 +01:00
2015-01-11 00:35:01 +01:00
2015-01-11 00:35:01 +01:00