]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97511bc 772d150)
Merge commit '772d150a6e82542c06b0c251e73dd299d98d1027'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Jun 2014 23:45:59 +0000 (01:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Jun 2014 23:46:30 +0000 (01:46 +0200)
* commit '772d150a6e82542c06b0c251e73dd299d98d1027':
  h264: error out from decode_nal_units() when AV_EF_EXPLODE is set

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264.c patch | diff1 | diff2 | blob | history

diff --cc libavcodec/h264.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.