diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 16:06:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 16:06:27 +0200 |
| commit | b65c290f7fecde65755cfb4ae1e452dcd0f07464 (patch) | |
| tree | fd0c9381faf4371bcd3153bb4edb38aee28a7c51 /libavformat/utils.c | |
| parent | 09e3fe79fc09459e62db73350909bda138792019 (diff) | |
| parent | 52254067b312e78d30bbe79fc33dbdf995b22b4e (diff) | |
| download | ffmpeg-b65c290f7fecde65755cfb4ae1e452dcd0f07464.tar.gz | |
Merge commit '52254067b312e78d30bbe79fc33dbdf995b22b4e' into release/1.1
* commit '52254067b312e78d30bbe79fc33dbdf995b22b4e':
error_concealment: avoid using the picture if not fully setup
Conflicts:
libavcodec/error_resilience.c
See: 68a0477bc0af026db971ddba22541029a9e8715b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions