ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-17 03:53:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,837 Commits 37 Branches 400 Tags 504 MiB
3242747df3
Commit Graph

2697 Commits

Author SHA1 Message Date
Michael Niedermayer
bca59d7745 fade: fix slice sizes 
This more evenly distributes the load between threads

This also fixes the chroma filtering where the filter was applied twice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 17:47:02 +02:00
Michael Niedermayer
029353e427 Merge commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68' 
* commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68':
  Monkey's Audio old versions FATE tests
  h264_parser: Set field_order and picture_structure.

Conflicts:
	libavcodec/h264_parser.c
	tests/fate/lossless-audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 12:15:56 +02:00
Kostya Shishkov
e9e5a1bdc7 Monkey's Audio old versions FATE tests 2013-05-24 09:04:18 +02:00
Michael Niedermayer
30df9789a9 proresdec: Fix end condition 
Fixes out of array writes
No FFmpeg release is affected by this

This also fixes some artifacts

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-22 20:24:50 +02:00
Carl Eugen Hoyos
898268a23b Add a fate test for ProRes Transparency. 2013-05-21 23:09:19 +02:00
Michael Niedermayer
a90baa63c3 add YUVJ411P 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 12:56:11 +02:00
Michael Niedermayer
877cae6eff Merge commit 'c209d0df657f172f42d9bafbcdfa02dfb14f6965' 
* commit 'c209d0df657f172f42d9bafbcdfa02dfb14f6965':
  fate.sh: add support for build-only FATE instances

Conflicts:
	doc/fate.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 11:36:49 +02:00
Diego Biurrun
c209d0df65 fate.sh: add support for build-only FATE instances 
If the "build_only" variable is set in the configuration file, the
FATE client will skip running tests and just compile all targets.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-21 10:07:19 +03:00
Michael Niedermayer
0a8e86faf2 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Escape 130 FATE test

Conflicts:
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-19 11:06:39 +02:00
Michael Niedermayer
fa6001e728 Merge commit '8e673efc6f5b7a095557664660305148f2788d30' 
* commit '8e673efc6f5b7a095557664660305148f2788d30':
  prores: update FATE test to account for alpha plane present in the test sample
  configure: Add basic valgrind-massif support

Conflicts:
	tests/fate/prores.mak
	tests/ref/fate/prores-alpha

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-19 10:53:39 +02:00
Kostya Shishkov
e45d6222cc Escape 130 FATE test 2013-05-19 07:09:36 +02:00
Kostya Shishkov
8e673efc6f prores: update FATE test to account for alpha plane present in the test sample 2013-05-19 07:09:23 +02:00
Michael Niedermayer
5918b7ac41 sws/output: init A1/A2 so that rgba64 ends with 0xffff in the absence of alpha input 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-18 01:20:30 +02:00
Jeremy Hinegardner
28e6b7b9b4 Turn off usage of base_data_offset in tfhd for PIFF files 
According to the PIFF specification[1] the base_data_offset field MUST be
omitteed. See section 5.2.17. Since the ISMV files created by ffmpeg state
that they are 'piff' compatible via 'ftyp' box, this needs to be corrected.

[1] http://www.iis.net/learn/media/smooth-streaming/protected-interoperable-file-format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-17 10:04:45 +02:00
Clément Bœsch
5c7a33a716 fate/colorchannelmixer: make sure direct path is tested. 2013-05-16 13:18:08 +02:00
Michael Niedermayer
0313653928 vc1dec: Update destination pointers in context for fields 
This replaces a large number of checks for the second field by
fixing the pointers when they are setup.

This should also fix I/BI field pictures.

Changes checksums for vc1_sa10143, the file becomes slightly closer
to what the reference decoder outputs.

Based on "vc1dec: the second field is written wrong to the picture"
by Sebastian Sandberg <sebastiand.sandberg@gmail.com>.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-15 11:38:49 +03:00
Luca Barbato
7cbc4cb442 fate: update the mmf reference 
Using Optional Data chunk introduced changes the hash.
 2013-05-14 18:50:27 +02:00
Martin Storsjö
5d9d8461fb vc1dec: Don't apply the loop filter on fields 
Fixes read of uninitialized memory.

Based on a patch by Michael Niedermayer.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-14 14:36:00 +03:00
Michael Niedermayer
6b13f54262 vf_colorchannelmixer: round lut entries to nearest 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-14 12:51:22 +02:00
Michael Niedermayer
f268727a8f fate: change colorchannelmixers coefficients to be less unstable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-14 12:49:11 +02:00
Reimar Döffinger
86215c326e Add 128 bit murmur3 hash function. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-05-13 21:42:37 +02:00
Michael Niedermayer
45150f90e7 fate: fix filter-colorchannelmixer by adding bitexact & accurate flags 
Idea by durandal11707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-13 17:15:58 +02:00
Paul B Mahol
2dedd8988a fate: add colorchannelmixer test 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-13 10:57:48 +00:00
Paul B Mahol
4383e1b239 tests/lavf-regression: fix gbrp10 dpx test on big endian 
For some reason only for that pix format decoder picks native format.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-13 10:09:03 +00:00
Paul B Mahol
c0a30dd2e4 fate: increase coverage for dpx encoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-12 22:04:40 +00:00
Paul B Mahol
ae9ef151ad dpxenc: simplifiy code using AVPixFmtDescriptor 
Update rgb24 fate test as it no longer writes image in big endian
format.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-12 21:56:29 +00:00
Paul B Mahol
e1746d057b swscale: RGBA64 output 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-12 21:47:19 +02:00
Paul B Mahol
87888c043d fate: add exr tests 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-12 11:47:30 +00:00
Clément Bœsch
09d3449a8f fate/filter: test gradfun timeline. 2013-05-12 13:07:47 +02:00
Clément Bœsch
9b11c2ef36 fate/filter: test hqdn3d timeline. 2013-05-12 13:07:47 +02:00
James Almer
67fad0d221 ADPCM IMA Radical decoder 
Signed-off-by: James Almer <jamrial@gmail.com>
 2013-05-10 16:53:50 -03:00
James Almer
e5e86db178 RedSpark demuxer 
Signed-off-by: James Almer <jamrial@gmail.com>
 2013-05-10 16:53:02 -03:00
James Almer
d3710c51d9 RSD demuxer 
Signed-off-by: James Almer <jamrial@gmail.com>
 2013-05-10 16:52:10 -03:00
James Almer
b4866f717c ADP demuxer 
Signed-off-by: James Almer <jamrial@gmail.com>
 2013-05-10 16:10:52 -03:00
Carl Eugen Hoyos
43b6482d0a Add fate test for solid colour lagarith frames. 2013-05-09 17:18:12 +02:00
Paul B Mahol
d1cb559a6a fate: add test for lut filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-09 10:37:58 +00:00
Paul B Mahol
5c057433cc libswscale: GBRAP input & output and GBRAP16 input support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-08 12:48:05 +00:00
Michael Niedermayer
63208c034b Merge commit 'bd392785a75d7d51414a9788d50396a8d9f29d77' 
* commit 'bd392785a75d7d51414a9788d50396a8d9f29d77':
  fate-run: Drop unnecessary regtest() indirection

Conflicts:
	tests/fate-run.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 14:21:39 +02:00
Michael Niedermayer
9818bbde53 Merge commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe' 
* commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe':
  nut: use meaningful error values
  FATE: use a less ambiguous end time for filter-trim-time test

Conflicts:
	libavformat/nutdec.c
	tests/fate/filter-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 12:47:54 +02:00
Diego Biurrun
bd392785a7 fate-run: Drop unnecessary regtest() indirection 
The indirection was used to abstract from the different -regression.sh
scripts. Now that only one remains, this indirection is pointless.
 2013-05-07 19:27:47 +02:00
Anton Khirnov
cd4bfe3a50 FATE: use a less ambiguous end time for filter-trim-time test 
0.1 seconds at 25 fps is exactly 2.5 frames, which may be rounded either
to 2 or 3 on different platforms.
 2013-05-07 12:33:13 +02:00
Michael Niedermayer
9276467bce Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fate-jpeg2000-dcinema: force output to xyz12le

Conflicts:
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-07 11:35:07 +02:00
Michael Niedermayer
fe5b089596 Merge commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110' 
* commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110':
  vf_scale: add endianness conversion pixel format in query_formats

Conflicts:
	libavfilter/vf_scale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-07 11:27:44 +02:00
Reimar Döffinger
399f6ef971 Add FATE test for matroska error recovery. 
This is the first 2 MB of the official test7.mkv.
That length seems to be enough to detect the bugs
we had in our code so far.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-05-07 05:30:19 +02:00
Janne Grunau
851465f9d9 fate-jpeg2000-dcinema: force output to xyz12le 
Fixes Fate tests on big-endian configs.
 2013-05-06 21:48:15 +02:00
Michael Niedermayer
336ffb8377 Merge commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07' 
* commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07':
  build: normalize coverage.info

Conflicts:
	tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-05 10:36:23 +02:00
Michael Niedermayer
fbede75a25 Merge commit '768e44d044bc32de1e58c198a3708d186af7e966' 
* commit '768e44d044bc32de1e58c198a3708d186af7e966':
  build: tune down the output of lcov/gcov

Conflicts:
	tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-05 10:18:41 +02:00
Reinhard Tartler
95e8ac60f8 build: normalize coverage.info 
Without this, lcov sometimes misses to normalize paths that contain "/./".
Also, ignore uninteresting hits in system headers.
 2013-05-04 09:34:58 +02:00
Reinhard Tartler
768e44d044 build: tune down the output of lcov/gcov 
In the default settings, both tools produce a lot of unhelpful noise.
 2013-05-04 09:34:58 +02:00
Michael Niedermayer
550defe16e Merge commit 'b333f3a22a4db4cf65d6a0457ac82ecbe7c7ac44' 
* commit 'b333f3a22a4db4cf65d6a0457ac82ecbe7c7ac44':
  lavf-regression: use -frames instead of -t for image tests

Conflicts:
	tests/lavf-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 11:41:48 +02:00
Anton Khirnov
b333f3a22a lavf-regression: use -frames instead of -t for image tests 
-t 0.5 is 12.5 frames at 25 fps, which may round to either 12 or 13 on
different platforms.
 2013-05-03 08:07:45 +02:00
Michael Niedermayer
2e2b6d7ab3 fate: Adjust filter-trim-time parameters 
This should workaround rounding differences between platforms

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-03 00:26:35 +02:00
Michael Niedermayer
fd68371b07 nutdec: Implement duration parsing for indexed nuts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-02 18:57:29 +02:00
Clément Bœsch
24939d567b fate/pixfmts: use the appropriate variable names for temporary files. 
${1} is now the filter args and is inappropriate as a unique name for
the test (and causes some FATE issues because of the ':' in them).
${filter} is not used either to replace the ${1} because ${outfile}
already contains a unique name for the test.
 2013-05-01 13:25:42 +02:00
Michael Niedermayer
3319679d0a Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876' 
* commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876':
  lavfi: add trim and atrim filters.

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 11:34:34 +02:00
Michael Niedermayer
52fa2945b5 Merge commit 'e036bb7899d0faca9159206be9bf5552e76e7633' 
* commit 'e036bb7899d0faca9159206be9bf5552e76e7633':
  lavc: clear AVBuffers on decoded frames if refcounted_frames is not set
  FATE: add an additional indeo3 test

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 10:00:08 +02:00
Paul B Mahol
a0adeb1f9f fate: add test for separatefields filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-30 10:22:16 +00:00
Paul B Mahol
468ec1714c fate: add test for swapuv filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-30 10:18:45 +00:00
Paul B Mahol
e85f02e3f5 fate: add test for telecine filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-30 10:10:23 +00:00
Anton Khirnov
a83c0da539 avconv: make -t insert trim/atrim filters. 
This makes -t sample-accurate for audio and will allow further
simplication in the future.

Most of the FATE changes are due to audio now being sample accurate. In
some cases a video frame was incorrectly passed with the old code, while
its was over the limit.
 2013-04-30 11:53:12 +02:00
Anton Khirnov
a1e05b0487 lavfi: add trim and atrim filters. 2013-04-30 11:24:57 +02:00
Anton Khirnov
3d10614529 FATE: add an additional indeo3 test 
It is a part of the sample that got broken by recent indeo3 changes.
 2013-04-30 11:06:03 +02:00
Clément Bœsch
2609434b45 fate: remove forgotten transpose filter results from old system. 2013-04-30 02:12:47 +02:00
Clément Bœsch
45734dea9e fate: port remaining filters to new system. 
Merge of b963f021b6 is now complete.
 2013-04-30 02:12:45 +02:00
Clément Bœsch
93aede41ce fate: move kerndeint test to the new system. 2013-04-30 01:47:53 +02:00
Clément Bœsch
1e0a0aafba fate: port our pixfmts change to fate-run.sh. 
This patch is the same as 52b23cbf1c.
 2013-04-30 01:47:53 +02:00
Clément Bœsch
e881057c98 fate: add a rule for pixfmts tests. 2013-04-30 01:47:53 +02:00
Clément Bœsch
a466c2c470 fate: fix filtfmts-test dependency after 9a5924f. 2013-04-30 01:19:24 +02:00
Clément Bœsch
6b222ea963 fate: add bitexact flags to alphaextract/alphamerge tests. 
Should fix a FATE failure.
 2013-04-29 22:28:37 +02:00
Clément Bœsch
9a5924f862 fate: add filters dependencies to pixfmts tests. 2013-04-29 22:25:04 +02:00
Clément Bœsch
15d6436a2a fate: move a few simple pixfmts tests to the new system. 2013-04-29 22:25:04 +02:00
Clément Bœsch
3ae44df18f fate: move lavd filters tests to the new system. 
Also make life test a bit more useful.
 2013-04-29 21:48:49 +02:00
Clément Bœsch
6ea013fb62 fate: remove '#' in filter parameters. 
It was considered a comment.
 2013-04-29 21:48:48 +02:00
Clément Bœsch
22a86492ec fate: move alphaextract and alphamerge tests to the new system. 
The standalone alphaextract tests are removed since already the filters
are already tested by the alphamerge tests.
 2013-04-29 21:10:13 +02:00
Clément Bœsch
9a0e40ec8c fate: move colormatrix tests to the new system. 2013-04-29 20:20:13 +02:00
Clément Bœsch
80bcbed157 fate: restore our settings for drawtext/fade/unsharp. 2013-04-29 20:00:49 +02:00
Clément Bœsch
c703f7bdbd fate: move more tests from lavfi-regression.sh to filter-video.mak. 2013-04-29 20:00:49 +02:00
Michael Niedermayer
cb23b06e5e sws: fix typo in xyz2rgb matrix use. 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-28 19:57:45 +02:00
Michael Niedermayer
54429142c5 fate: re-enable jpeg2000 test with rgb48le 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-28 19:31:52 +02:00
Michael Niedermayer
42a7938cca fate: temporary disable jpeg2000 test to avoid fate breakage from next commits 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-28 19:19:03 +02:00
Michael Niedermayer
b4fc2a10df fate: fix jpeg2000 on big endian 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-28 15:54:02 +02:00
Michael Niedermayer
124244ec48 Merge commit 'b963f021b603509b5159873de4919dec441d0782' 
* commit 'b963f021b603509b5159873de4919dec441d0782':
  fate: Invoke pixfmts lavfi tests through fate-run.sh

Conflicts:
	tests/fate/avfilter.mak
	tests/lavfi-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-28 13:34:23 +02:00
Michael Niedermayer
191430a28f Merge commit '28663511c99b3cdaf9387a15032259879474f5f4' 
* commit '28663511c99b3cdaf9387a15032259879474f5f4':
  fate: Invoke pixdesc lavfi tests through fate-run.sh

Conflicts:
	tests/fate/avfilter.mak
	tests/lavfi-regression.sh
	tests/ref/fate/filter-pixdesc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-28 13:00:04 +02:00
Michael Niedermayer
506ebdac2a Merge commit '03b052c023e1f58d879cb7eeb6421ed39262d39d' 
* commit '03b052c023e1f58d879cb7eeb6421ed39262d39d':
  fate: Invoke standard lavfi tests through fate-run.sh

Conflicts:
	tests/fate/avfilter.mak
	tests/lavfi-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-28 12:34:55 +02:00
Diego Biurrun
b963f021b6 fate: Invoke pixfmts lavfi tests through fate-run.sh 2013-04-27 16:53:42 +02:00
Diego Biurrun
28663511c9 fate: Invoke pixdesc lavfi tests through fate-run.sh 2013-04-27 16:53:42 +02:00
Diego Biurrun
03b052c023 fate: Invoke standard lavfi tests through fate-run.sh 2013-04-27 16:53:42 +02:00
Michael Niedermayer
3fa6c992d9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: ac3dsp: Remove 3dnow version of ff_ac3_extract_exponents

Conflicts:
	tests/fate/ac3.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-27 11:35:03 +02:00
Diego Biurrun
7c00e9d8ae x86: ac3dsp: Remove 3dnow version of ff_ac3_extract_exponents 
The function requires increasing the fuzz factor for the ac3/eac3 encode
tests and even so makes fate fail. It only provides a slight encoding
speedup for legacy CPUs that do not support SS2. Thus its benefit is not
worth the trouble it creates and fixing it would be a waste of time.
 2013-04-26 21:06:52 +02:00
Michael Niedermayer
eba33396f0 avformat/mux: set avoid_negative_ts based on flags if not overridden by user or muxer 
This changes the default to avoid negative timestamps.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-26 14:51:47 +02:00
Michael Niedermayer
667159e718 fate: re-enable fate-acodec-dca2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-25 23:23:12 +02:00
Paul B Mahol
084709f6a5 fate: update dca test and disable dca2 test 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-25 18:39:30 +00:00
Luca Barbato
c2cb01d418 lavf: introduce AVFMT_TS_NEGATIVE 
Most formats do not support negative timestamps, shift them to avoid
unexpected behaviour and a number of bad crashes.

CC:libav-stable@libav.org

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-04-25 10:13:27 +02:00
Michael Niedermayer
575399c7e1 Merge commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d' 
* commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d':
  fate: add CVFC1_Sony_C to h264 conformance tests
  doc/APIchanges: add missing hashes and dates

Conflicts:
	doc/APIchanges
	tests/fate/h264.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-25 09:54:11 +02:00
Nicolas George
70feca926b lavc: check decoded subtitles encoding. 
Address trac ticket #2431.
 2013-04-24 19:41:27 +02:00
Vittorio Giovara
fc18cc44eb fate: add CVFC1_Sony_C to h264 conformance tests 
The sample is already included in the FATE suite, but is not tested
because cropping wasn't fully supported before.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-04-24 17:44:11 +02:00
Michael Niedermayer
e2e9bee2da Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avcodec: Bump minor for JPEG 2000 decoder
  JPEG 2000 decoder for DCinema

The mqc code is merged, the rest is added independent of
the existing jpeg2000 decoder and encoder.

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/mqc.c
	libavcodec/mqc.h
	libavcodec/mqcdec.c
	libavcodec/version.h
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-22 20:00:54 +02:00
Michael Niedermayer
c1c2b0b339 avcodec: rename jpeg2000 decoder to j2k 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-22 19:28:33 +02:00
Nicolas Bertrand
c81a706381 JPEG 2000 decoder for DCinema 
Based on the 2007 GSoC project from Kamil Nowosad <k.nowosad@students.mimuw.edu.pl>
Updated to current programming standards, style and many more small
fixes by Diego Biurrun <diego@biurrun.de>.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-22 15:38:29 +02:00
Michael Niedermayer
80d4d3a41d fate: re-enable af_join test 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-22 14:54:38 +02:00