1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavcodec
Michael Niedermayer c53a1507aa Merge commit '199d9f995da53fe2507821f6d96bbc692574e1a9'
* commit '199d9f995da53fe2507821f6d96bbc692574e1a9':
  mjpegdec: fix undefined shift

Conflicts:
	libavcodec/mjpegdec.c

See: b4329605289e25bb071ec1c1182bf25fc83b09aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-06 18:28:49 +01:00
..
2014-10-22 23:12:38 +02:00
2014-10-22 23:12:38 +02:00
2014-10-22 23:12:38 +02:00
2014-10-24 09:53:42 +03:00
2014-10-15 16:08:36 +02:00
2014-10-28 12:22:03 +01:00
2014-10-28 12:22:03 +01:00
2014-10-28 12:48:58 +01:00
2014-10-28 15:30:05 +01:00
2014-10-24 09:53:42 +03:00
2014-11-03 10:15:07 -05:00
2014-10-27 20:55:57 +01:00
2014-10-18 19:41:48 +02:00
2014-10-22 23:12:38 +02:00
2014-10-15 16:08:36 +02:00
2014-10-18 20:06:29 +02:00