virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
36,387 Commits 37 Branches 400 Tags 465 MiB
69d766daa0
Commit Graph

36387 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul B Mahol
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 Mahol
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 First
12bdc7b15e ffmpeg: fix compiler warning for uninitialized variables 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 03:24:18 +01:00
Jean First
f2eb2e5c4f wtvdec: use intfloat.h instead of intfloat_readwrite.h 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 03:23:58 +01:00
Jean First
535705a489 ffmpeg: use avformat_close_input instead of av_close_input_file 
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:19:03 +01:00
Jean First
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
Reinhard Tartler
302371c055 Release notes: mention cleaned up header includes 
A rebuild in debian revealed that this broke compilation of a number packages:
http://bugs.debian.org/cgi-bin/pkgreport.cgi?users=siretart@tauware.de;tag=ftbfs-libav0.8
 2012-01-02 17:21:55 +01:00
Reinhard Tartler
4fb930a800 fix Changelog file 
Both the Indeo 4 decoder and the SMJPEG demuxer were included in the
0.8_beta1 release.
 2012-01-02 17:21:55 +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
0af34c4d2c MAINTAINERS: update release maintainers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-02 16:01:33 +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
Clément Bœsch
e1a8164d62 mp3enc: fix playback with mp3 encoded files on some devices. 
This partially reverts 1fea432b; header variable needs to keep its value
in case it triggers "if (needed <= c.frame_size)".
 2012-01-02 15:34:03 +01:00
Clément Bœsch
940d3cc0b0 drawtext: fix hard dependency to lavc (timecode). 2012-01-02 15:33:56 +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
Anton Khirnov
c88d53199b avconv: remove the 'codec framerate is different from stream' warning 
Codec timebase is not framerate and the situation when it's different
from AVStream.r_frame_rate is quite common, nothing to warn about.
 2012-01-02 14:15:09 +01:00
Hendrik Leppkes
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
Jean First
e2c1d3ec41 flvdec: use av_uninit to silence compiler warnings 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-02 03:38:58 +01:00
Paul B Mahol
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 First
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
Janne Grunau
af9240cd3c mpegenc: simplify muxrate calculation 
The fate-h264-bsf-mp4toannexb failures were caused by an integer
overflow of the unneeded multiplication.

Inspired by patch by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-02 00:23:40 +01:00
Carl Eugen Hoyos
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 Mahol
c0f7c574e9 Cosmetics: Replace -1 with PIX_FMT_NONE. 2012-01-01 23:23:58 +01:00
Anton Khirnov
f15f02c204 avconv: make -frames work for all types of streams, not just video. 2012-01-01 22:27:52 +01:00
Aneesh Dogra
f7e30cc13b bfi: K&R cosmetics 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-01-01 22:27:04 +01:00
Aneesh Dogra
87d9874864 bgmc: K&R cleanup 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-01-01 22:27:04 +01:00
Reimar Döffinger
c914038d38 rawdec: Set start_time to 0 for raw audio files. 
None of the raw audio files have timestamps, thus setting
start_time to 0 should be reasonable.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-01-01 22:27:04 +01:00
Carl Eugen Hoyos
835af79b05 Detect 'yuv2' as rawvideo also in avi. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-01-01 22:27:04 +01:00
Stefano Sabatini
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 Bandurski
d3a5c26986 rawdec: Support more QT 1bpp rawvideo files. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-01-01 22:27:04 +01:00
Janne Grunau
1135a07146 avconv: free bitstream filters 2012-01-01 21:48:50 +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
Jean First
6bd8d61378 mov: av_dlog use PRId64 instead of %ld 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-01 21:19:07 +01:00
Jean First
d92d2af81f mxfdec: change av_log formatting %lx to PRIx64 and %li to PRIi64 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-01 21:15:46 +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