falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit '9a26ba971387a348e14f363ddcdcb5bba0b413d1' 

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

Conflicts:
	libavdevice/v4l2.c

See: 0fb79f30db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.6
Michael Niedermayer 11 years ago
parent
cde6e328de 9a26ba9713
commit
f2e01b693f
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available