]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5219afc b7462a3)
Merge commit 'b7462a3904d71ff799584faf5b875cad59ca2f31'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 00:16:26 +0000 (01:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 00:17:18 +0000 (01:17 +0100)
* commit 'b7462a3904d71ff799584faf5b875cad59ca2f31':
  jvdec: use the AVFrame API properly.

Conflicts:
libavcodec/jvdec.c

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

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