x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-07-11 05:53:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,388 Commits 40 Branches 429 Tags
d1669e5fe3d61dc4181f96138eb4355aaaf231ea
Commit Graph
16929 Commits
Author SHA1 Message Date
Michael BradshawandMichael Niedermayer d1669e5fe3 Fixed openjpeg decoding bug with width/linesize issue 
The original code wasn't taking into account the fact that linesize may not equal the frame's width.  This is to correct that.

Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 06:15:33 +01:00
Paul B MaholandMichael Niedermayer 69d766daa0 lavc: replace rest of deprecated SAMPLE_FMT_* with AV_SAMPLE_FMT_* 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 04:00:52 +01:00
Paul B MaholandMichael Niedermayer 7099f36578 lavc: replace rest of deprecated FF_*_TYPE with AV_PICTURE_TYPE_* 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 03:25:22 +01:00
Jean FirstandMichael Niedermayer f86c348d46 vp3: remove redeclaration of vp3_decode_flush 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 03:16:42 +01:00
Michael Niedermayer 7d8f115843 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpegenc: use avctx->slices as number of slices
  v410enc: fix undefined signed left shift caused by integer promotion
  Release notes: mention cleaned up header includes
  fix Changelog file
  Fix a bunch of typos.
  Drop some pointless void* return value casts from av_malloc() invocations.
  wavpack: fix typos in previous cosmetic clean-up commit
  wavpack: cosmetics: K&R pretty-printing
  avconv: remove the 'codec framerate is different from stream' warning
  wavpack: determine sample_fmt before requesting a buffer
  bmv audio: implement new audio decoding API
  mpegaudiodec: skip all channels when skipping granules
  mpegenc: simplify muxrate calculation

Conflicts:
	Changelog
	avconv.c
	doc/RELEASE_NOTES
	libavcodec/h264.c
	libavcodec/mpeg12.c
	libavcodec/mpegaudiodec.c
	libavcodec/mpegvideo.c
	libavformat/mpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 03:06:45 +01:00
Janne Grunau 881a5e047d mpegenc: use avctx->slices as number of slices 
Adds a new member to MpegEncContext to hold the number of used slice
contexts. Fixes segfaults with '-threads 17 -thread_type slice' and
fate-vsynth{1,2}-mpeg{2,4}thread{,_ilace} with --disable-pthreads.
 2012-01-02 19:20:23 +01:00
Janne Grunau 264808219d v410enc: fix undefined signed left shift caused by integer promotion 2012-01-02 19:20:23 +01:00
Michael Niedermayer 45552371e3 jpegdec: non interleaved rgb ljpeg support. 
Fixes Ticket856

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-02 19:06:46 +01:00
Michael Niedermayer 465eb0eb48 jpegdec: 9-16 bit yuv/gray ljpeg support. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-02 17:53:41 +01:00
Michael Niedermayer 24964f21e4 jpegdec: Only enable rgb mode when there are 3 components. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-02 17:53:40 +01:00
Diego Biurrun 8fd35b1aac Fix a bunch of typos. 2012-01-02 16:41:25 +01:00
Diego Biurrun 44b0edda3f Drop some pointless void* return value casts from av_malloc() invocations. 2012-01-02 16:41:24 +01:00
Michael Niedermayer a2a12e3358 vp3: fix regression with mplayer-crash.ogv 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-02 15:35:18 +01:00
Justin Ruggles 3a1867deac wavpack: fix typos in previous cosmetic clean-up commit 2012-01-02 08:54:30 -05:00
Justin Ruggles 513c238fa9 wavpack: cosmetics: K&R pretty-printing 2012-01-02 08:52:59 -05:00
Hendrik LeppkesandJustin Ruggles 14165fe125 wavpack: determine sample_fmt before requesting a buffer 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-01-01 23:24:15 -05:00
Justin Ruggles 8893fbdf7a bmv audio: implement new audio decoding API 2012-01-01 22:56:04 -05:00
Justin Ruggles 03fafdec82 mpegaudiodec: skip all channels when skipping granules 
Also fix calculation of new position when switching buffers.
This fixes "overread" error messages when seeking.
 2012-01-01 22:37:50 -05:00
Paul B MaholandMichael Niedermayer dfa77dead2 y41p encoder and decoder 
y41p is a packed 12-bit 4:1:1 YUV format used by Brooktree.

Fixes issue 1123 / ticket #102.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-02 03:35:23 +01:00
Jean FirstandMichael Niedermayer b103156235 j2kdec: av_log formatting use %tx instead of %x 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-02 03:25:49 +01:00
Michael Niedermayer 157f29f9a6 Revert "mpegvideo: Do not error out on default values of thread_count." 
This is not needed anymore.

This reverts commit ca0350f49b.
 2012-01-02 03:10:52 +01:00
Michael Niedermayer 4121148388 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: make -frames work for all types of streams, not just video.
  bfi: K&R cosmetics
  bgmc: K&R cleanup
  rawdec: Set start_time to 0 for raw audio files.
  Detect 'yuv2' as rawvideo also in avi.
  rawdec: propagate pict_type information to the output frame
  rawdec: Support more QT 1bpp rawvideo files.
  avconv: free bitstream filters
  threads: limit the number of automatic threads to MAX_AUTO_THREADS
  avplay: K&R cleanup
  fate: use rgb24 as output format for dfa tests
  threads: set thread_count to 1 when thread support is disabled
  threads: introduce CODEC_CAP_AUTO_THREADS and add it to libx264

Conflicts:
	ffplay.c
	libavcodec/avcodec.h
	libavcodec/pthread.c
	libavcodec/version.h
	tests/ref/fate/dfa1
	tests/ref/fate/dfa10
	tests/ref/fate/dfa11
	tests/ref/fate/dfa2
	tests/ref/fate/dfa3
	tests/ref/fate/dfa4
	tests/ref/fate/dfa5
	tests/ref/fate/dfa6
	tests/ref/fate/dfa7
	tests/ref/fate/dfa8
	tests/ref/fate/dfa9

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-02 03:10:30 +01:00
Carl Eugen HoyosandMichael Niedermayer ef611095f0 Add missing PIX_FMT_NONE to libopenjpegenc 
fixes ticket #813

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Jean First <jeanfirst@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-01 23:46:58 +01:00
Paul B MaholandCarl Eugen Hoyos c0f7c574e9 Cosmetics: Replace -1 with PIX_FMT_NONE. 2012-01-01 23:23:58 +01:00
Aneesh DograandAnton Khirnov f7e30cc13b bfi: K&R cosmetics 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-01-01 22:27:04 +01:00
Aneesh DograandAnton Khirnov 87d9874864 bgmc: K&R cleanup 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-01-01 22:27:04 +01:00
Stefano SabatiniandAnton Khirnov 28b4af8e38 rawdec: propagate pict_type information to the output frame 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-01-01 22:27:04 +01:00
Piotr BandurskiandAnton Khirnov d3a5c26986 rawdec: Support more QT 1bpp rawvideo files. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-01-01 22:27:04 +01:00
Michael Niedermayer 9ba43e50ef h264: Fix frame sync / random access handling. 
It seems I have misunderstood the spec when I implemented this
originally.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-01 21:43:44 +01:00
Michael Niedermayer fba6777363 h264: Fix recovery_frame initialization when recovery_frame is -1 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-01 21:43:43 +01:00
Michael Niedermayer 36fa781bd6 h264: reset picture->sync on allocation. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-01 21:43:42 +01:00
Janne Grunau b12d217339 threads: limit the number of automatic threads to MAX_AUTO_THREADS 
The extra thread added in {frame_}*thread_init was not taken into
account. Explicitly sets thread_count to 1 if only one CPU core was
detected. Also fixes two typos in comments.
 2012-01-01 21:11:43 +01:00
Michael Niedermayer ecb14b8af7 h264: add forgotten \n to "Invalid mix of idr and non-idr slices" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-01 21:04:34 +01:00
Michael Niedermayer 393253b4b3 h264: Print pass in NAL debug output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-01 21:04:34 +01:00
Janne Grunau b6064d9a59 threads: set thread_count to 1 when thread support is disabled 2012-01-01 14:37:38 +01:00
Janne Grunau b4d44a45f9 threads: introduce CODEC_CAP_AUTO_THREADS and add it to libx264 
Some external codecs have their own code to determine the best number
of threads. This number is not necessary the number of cpu cores.
Thread_count will be only 0 if the codec has CODEC_CAP_AUTO_THREADS.
 2012-01-01 14:37:37 +01:00
Carl Eugen Hoyos 03d7d8faef Support gray8a pam encoding. 2012-01-01 04:44:46 +01:00
Michael Niedermayer 57581e4110 pthread: dont autoenable frame threads with visualization 
This combination doesnt work

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-01 02:54:31 +01:00
Michael Niedermayer e404eee1e1 pthread: Limit automatic threads to mb_height. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-01 02:39:06 +01:00
Michael Niedermayer 9c1f0493d5 Revert 464f26889c 
The code is not needed for us and it doesnt work completely.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-01 02:38:40 +01:00
Michael Niedermayer 099d6813c2 svq3: Fix memory corruption introduced by automatic thread_count. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-01 00:46:05 +01:00
Michael Niedermayer ca0350f49b mpegvideo: Do not error out on default values of thread_count. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-01 00:46:05 +01:00
Michael Niedermayer 4478e9d8db Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  FATE: add tests for dfa
  mpegaudiodec: fix seeking.
  mpegaudiodec: fix compilation when testing the unchecked bitstream reader
  threads: add sysconf based number of CPUs detection
  threads: always include necessary headers for number of CPUs detection
  threads: default to automatic thread count detection
  Changelog: restore version <next> header
  cook: K&R formatting cosmetics

Conflicts:
	Changelog
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-01 00:07:31 +01:00
Carl Eugen Hoyos 714d2f9796 Only expand raw and packed 1bpp tiff horizontally if it is palettised. 2011-12-31 20:46:36 +01:00
Michael Niedermayer 9d9316ae34 h264: Fix seeking in 00017.MTS 
Fixes Ticket852

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-31 20:32:05 +01:00
Ronald S. BultjeandJustin Ruggles 464f26889c mpegaudiodec: fix seeking. 
The safe bitstream reader does not allow using skip_bits_long() to seek to a
point before the start of the buffer, which was needed by the mp3 decoder.
This change instead calculates the start point of the first valid granule and
skips to that position.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2011-12-31 14:19:09 -05:00
Justin Ruggles 481a7ff5bd mpegaudiodec: fix compilation when testing the unchecked bitstream reader 2011-12-31 14:19:09 -05:00
Janne Grunau bcc7396065 threads: add sysconf based number of CPUs detection 
Can act as fallback and should work on a couple of Unix systems.
 2011-12-31 17:40:12 +01:00
Janne Grunau 937ff3a18a threads: always include necessary headers for number of CPUs detection 
Since the conditions for the actual usage are more specific a less
preferred method can be used. This would cause compilation errors
because necessary headers are not included.
 2011-12-31 17:40:12 +01:00
Janne Grunau e4e30256f8 threads: default to automatic thread count detection 2011-12-31 17:40:12 +01:00