]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 577b39a d5e8312)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Nov 2012 13:36:12 +0000 (14:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Nov 2012 13:36:53 +0000 (14:36 +0100)
* qatar/master:
  h264: set Picture.owner2 to the current thread

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

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