diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:09:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:09:14 +0100 |
| commit | 70eec8f432dcee5b9867ba01a26436a04a9a0423 (patch) | |
| tree | c8880981559e31c14696486f7b300ed5c9cf0076 /libavdevice/v4l2-common.c | |
| parent | da7f4c32ab6bf517d4ef51297da46cf459479b22 (diff) | |
| parent | 47a0d393504d6726c4a235951153bee0abb3f7d6 (diff) | |
| download | ffmpeg-70eec8f432dcee5b9867ba01a26436a04a9a0423.tar.gz | |
Merge commit '47a0d393504d6726c4a235951153bee0abb3f7d6'
* commit '47a0d393504d6726c4a235951153bee0abb3f7d6':
h264: move mb_skip_run into the per-slice context
Conflicts:
libavcodec/h264_cavlc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/v4l2-common.c')
0 files changed, 0 insertions, 0 deletions