diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-20 19:33:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-20 21:40:05 +0200 |
| commit | 642355712b970c4b17a207cc0ea42ea6adaba39f (patch) | |
| tree | 22a5ce8a76c3789abed0bdd1c6f4aaff601f3a3e /ffmpeg_opt.c | |
| parent | bb23a15df507440deb0dcf25099d321d0f73dc28 (diff) | |
| parent | 3efe0393e4f0eaa27bac8833edbd7d3cff4704e1 (diff) | |
Merge commit '3efe0393e4f0eaa27bac8833edbd7d3cff4704e1'
* commit '3efe0393e4f0eaa27bac8833edbd7d3cff4704e1':
hevc: make avcodec_decode_video2() fail if get_format() fails
Conflicts:
libavcodec/hevc.c
See: cc5e4bb48476a89cc8ce0c41bc2bd2e8fda9b37c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions