Merge commit '9a26ba971387a348e14f363ddcdcb5bba0b413d1'

Browse Source

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

Conflicts:
	libavdevice/v4l2.c

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

...

This commit is contained in:

Michael Niedermayer 2015-03-02 20:30:54 +01:00

parent cde6e328de 9a26ba9713

commit f2e01b693f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available