[FFmpeg-cvslog] Merge commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7'
Michael Niedermayer
git at videolan.org
Fri Feb 20 22:12:09 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 20 22:03:54 2015 +0100| [dc6eadaa458aa2e3ce407459b37e8f8403e455b4] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dc6eadaa458aa2e3ce407459b37e8f8403e455b4
---
More information about the ffmpeg-cvslog
mailing list