[FFmpeg-cvslog] Merge commit '58ae8d595724150c407ca2c2df3aa4bd5580397c'
Michael Niedermayer
git at videolan.org
Tue Jan 27 16:02:02 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 27 15:24:08 2015 +0100| [f25f15b6e1c4f597b0d31fb5b9fe7e8e40dd0fb1] | committer: Michael Niedermayer
Merge commit '58ae8d595724150c407ca2c2df3aa4bd5580397c'
* commit '58ae8d595724150c407ca2c2df3aa4bd5580397c':
h264_parser: restore a comment lost in 0268a54
Conflicts:
libavcodec/h264_parser.c
No change, the code that is commented is no longer there in the form to
which the comment applied
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f25f15b6e1c4f597b0d31fb5b9fe7e8e40dd0fb1
---
More information about the ffmpeg-cvslog
mailing list