FFmpeg/libavcodec/error_resilience.c at 03cecf45c134ebbaecb62505fe444ade423ea7dc

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00

Files

Michael Niedermayer 3d04117078 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>

2015-01-27 14:56:52 +01:00

50 KiB

Raw Blame History

View Raw

50 KiB Raw Blame History

50 KiB

Raw Blame History