ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri Aug 15
02:08:59 2014 +0200| [2fd87a3d7895ce36e558a306d03e33697d456086] | committer:
Michael Niedermayer
Merge commit '998c9f15d1ca8c7489775ebcca51623b915988f1'
* commit '998c9f15d1ca8c7489775ebcca51623b915988f1':
idct: remove call to ff_idctdsp_init from ff_MPV_common_init
Conflicts:
libavcodec/dnxhdenc.c
libavcodec/h263dec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2fd87a3d7895ce36e558a306d03e33697d456086
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
