diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 13:36:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 13:37:34 +0100 |
| commit | deaaacbc3f8dafceb58e4512eba137744b2df94f (patch) | |
| tree | 8dad24bcb9f355196bc2deb85fb14ad562f93af7 /libavdevice/v4l.c | |
| parent | 10ec2308b0d41291e38dfca6ad885bbe29302519 (diff) | |
| parent | 0b25c3b67cef73ab1370db99da906ebc215a3c72 (diff) | |
| download | ffmpeg-deaaacbc3f8dafceb58e4512eba137744b2df94f.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.5' into release/0.5
* qatar/release/0.5:
mpeg12: do not decode extradata more than once.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/v4l.c')
0 files changed, 0 insertions, 0 deletions