diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 20:00:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 20:00:34 +0100 |
| commit | 830e548b9ec32ad7ab02be056db15cbcf3c58346 (patch) | |
| tree | 03ce45e4c52217252ae2fb8f960d75cd4f23d51c /libavutil/file.h | |
| parent | 44309dd29466bf2d9d9fa26ab6e73e7e64989c75 (diff) | |
| parent | 582683b6ac798ed2a004a4e2121b7bd47892bbfd (diff) | |
| download | ffmpeg-830e548b9ec32ad7ab02be056db15cbcf3c58346.tar.gz | |
Merge commit '582683b6ac798ed2a004a4e2121b7bd47892bbfd'
* commit '582683b6ac798ed2a004a4e2121b7bd47892bbfd':
h264: move remaining ER stuff into the per-slice context
Conflicts:
libavcodec/h264.h
libavcodec/h264_picture.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/file.h')
0 files changed, 0 insertions, 0 deletions