diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:18:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:18:29 +0100 |
| commit | 668c65e7e73a21c86f43ffa1f79bf023fa44cbcd (patch) | |
| tree | 0cb290199a3e87504efbce8519dc80143e902281 /libavdevice/dv1394.c | |
| parent | db4234c5002fc0ac7ecae323874b97a4547ae0c3 (diff) | |
| parent | 0edbe6faa7ef80daf0e84353cbe733389bf1a522 (diff) | |
| download | ffmpeg-668c65e7e73a21c86f43ffa1f79bf023fa44cbcd.tar.gz | |
Merge commit '0edbe6faa7ef80daf0e84353cbe733389bf1a522'
* commit '0edbe6faa7ef80daf0e84353cbe733389bf1a522':
h264: move mb_xy into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/dv1394.c')
0 files changed, 0 insertions, 0 deletions