diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 15:42:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 15:43:03 +0100 |
| commit | c427b2b86e726159873eb6cc4f7153c5bd778c55 (patch) | |
| tree | bf84ff8620f5b1940aa8af20e0c5478267f59955 /libavdevice/v4l2enc.c | |
| parent | add54280bfc101b842959e5fb96260cdb0882954 (diff) | |
| parent | 4bcca3611da24583dfbb8a1cc4c404a7deaa5590 (diff) | |
| download | ffmpeg-c427b2b86e726159873eb6cc4f7153c5bd778c55.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpeg4video_parser: Drop pointless av_-prefix from static function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/v4l2enc.c')
0 files changed, 0 insertions, 0 deletions