falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit 'b564784a207b1395d2b5a41e580539df04651096' 

* commit 'b564784a207b1395d2b5a41e580539df04651096':
  jpeg2000: Check that there is a SOT before SOD
  jpeg2000: Remove unneeded returns

Conflicts:
	libavcodec/jpeg2000.c
	libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.0
Michael Niedermayer 12 years ago
parent
ac3ca3d311 b564784a20
commit
273f600b03
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available