projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 78a79a2 a53551c)
Merge commit 'a53551cba86bb67efcb6105fdc337a36c43132bd'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 10:34:12 +0000 (12:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 10:35:02 +0000 (12:35 +0200)
* commit 'a53551cba86bb67efcb6105fdc337a36c43132bd':
  frame: fix the error path in av_frame_copy_props()

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

diff --cc libavutil/frame.c
Simple merge
FFmpeg git repo