[FFmpeg-cvslog] Merge commit '9a26ba971387a348e14f363ddcdcb5bba0b413d1'

Michael Niedermayer git at videolan.org
Mon Mar 2 20:40:32 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  2 20:30:54 2015 +0100| [f2e01b693fe45cebce9b8ec3bca7a29746f859be] | committer: Michael Niedermayer

Merge commit '9a26ba971387a348e14f363ddcdcb5bba0b413d1'

* commit '9a26ba971387a348e14f363ddcdcb5bba0b413d1':
  v4l2: Add support for h264

Conflicts:
	libavdevice/v4l2.c

See: 0fb79f30db138e3686fbfcf88ba58ea7c1e61bfc
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list