diff options
| author | Michael Niedermayer <[email protected]> | 2013-07-03 14:59:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-07-03 14:59:35 +0200 |
| commit | 273f600b037ccf166e5540bc6e8e13d3bf738aa9 (patch) | |
| tree | 6ed8d72a329cfb6eebec70d3d748f8acb2b3720d /libavcodec/dcadsp.c | |
| parent | ac3ca3d311bb09482049fe5e48ba905f3263a728 (diff) | |
| parent | b564784a207b1395d2b5a41e580539df04651096 (diff) | |
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 <[email protected]>
Diffstat (limited to 'libavcodec/dcadsp.c')
0 files changed, 0 insertions, 0 deletions