diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 14:56:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 14:56:52 +0100 |
| commit | 3d0411707839d3af1f34e0a8c7c8cbe4dd02b1ba (patch) | |
| tree | b8acca47871747e129ca6b33b06ea603fd9c6a9d /libavformat/asf.h | |
| parent | a1cdd1f08e06582c93fe66eacfc7c09e42321115 (diff) | |
| parent | cf1e0786ed64e69614760bfb4ecd7adbde8e6094 (diff) | |
| download | ffmpeg-3d0411707839d3af1f34e0a8c7c8cbe4dd02b1ba.tar.gz | |
Merge commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094'
* commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094':
error_resilience: move the MECmpContext initialization into ER code
Conflicts:
libavcodec/error_resilience.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/asf.h')
0 files changed, 0 insertions, 0 deletions