eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-14 02:50:11 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
a696b0917d1d1ef5b0dee691786ddb51ee4ab519
ffmpeg/libavcodec/rtjpeg.c
Michael Niedermayer 32da2fd422 Merge commit '1df0b061621b10edde87e3ab7ea83aed381c574f' 
* commit '1df0b061621b10edde87e3ab7ea83aed381c574f':
  nuv: Reuse the DSPContext from RTJpegContext

Conflicts:
	libavcodec/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-22 21:58:04 +01:00

5.8 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink