diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-02 20:30:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-02 20:30:54 +0100 |
| commit | f2e01b693fe45cebce9b8ec3bca7a29746f859be (patch) | |
| tree | af5983da834523bf9e2315287212a8a87901b202 /libavformat/mov.c | |
| parent | cde6e328de214ffe8387641cdc1e433a2c2150f3 (diff) | |
| parent | 9a26ba971387a348e14f363ddcdcb5bba0b413d1 (diff) | |
| download | ffmpeg-f2e01b693fe45cebce9b8ec3bca7a29746f859be.tar.gz | |
Merge commit '9a26ba971387a348e14f363ddcdcb5bba0b413d1'
* commit '9a26ba971387a348e14f363ddcdcb5bba0b413d1':
v4l2: Add support for h264
Conflicts:
libavdevice/v4l2.c
See: 0fb79f30db138e3686fbfcf88ba58ea7c1e61bfc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov.c')
0 files changed, 0 insertions, 0 deletions