ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Jan 27 
15:08:17 2015 +0100| [6e57d2da9058fcb0eefedf5102321a044d51e6dc] | committer: 
Michael Niedermayer

Merge commit '9404a47a2d1df418946a338938eb6cdb3afed474'

* commit '9404a47a2d1df418946a338938eb6cdb3afed474':
  h264: move parser-only variables to their own context

Conflicts:
        libavcodec/h264_parser.c

Merged-by: Michael Niedermayer <michae...@gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e57d2da9058fcb0eefedf5102321a044d51e6dc
---



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to