virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
46,996 Commits 37 Branches 400 Tags 460 MiB
4a753fc5f7
Commit Graph

46996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefano Sabatini
4a753fc5f7 tests: prefer ffprobe -show_entries to -show_format_entry 
The latter option was deprecated.
 2012-11-22 15:57:41 +01:00
Michael Niedermayer
a9cfbf6d4b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  id3v2: fix reading unsynchronized frames.
  cdgraphics: fix incorrect vertical offset mask in cdg_scroll()
  apetag: fix error handling in ff_ape_parse_tag()

Conflicts:
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-22 15:36:50 +01:00
Stefano Sabatini
c8a5365dcf ffprobe: implement -sections option 2012-11-22 14:19:29 +01:00
Stefano Sabatini
196765a7cc ffprobe: implement subsection field selection through the -show_entries option 2012-11-22 14:19:25 +01:00
Anton Khirnov
9ae80e6a9c id3v2: fix reading unsynchronized frames. 
Current code would incorrectly process e.g. 'ff 00 ff 00 ff' to
'ff ff ff', while it should be 'ff ff 00 ff'.

Fixes Bug 395.

CC: libav-stable@libav.org
 2012-11-22 13:40:04 +01:00
Stefano Sabatini
f67ebf5b77 lavfi/avfiltergraph: improve error message in graph_check_validity() 
Fix trac ticket #1944.
 2012-11-22 13:14:20 +01:00
Stefano Sabatini
eb87b340e8 lavfi/drawtext: add support for printing frame numbers 
Fix trac ticket #1949.
 2012-11-22 13:14:19 +01:00
Tim Nicholson
dcbf72836c ffmpeg: add setting of field_order flag 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-22 05:30:43 +01:00
Michael Niedermayer
91743fb730 frwu: do not set interlacing flags. 
Our fate frwu sample is definitely not interlaced.
If someone has a interlaced frwu file, please contact us.

Without this change the field order patch would cause
incorrect interlacing information to be written when
using frwu input.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-22 05:21:38 +01:00
Michael Niedermayer
305a935968 brender: move declaration out of for() to make old compilers happy. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-22 01:07:16 +01:00
Aleksi Nurmi
492a5f835c brender_pix: a new image decoder 
PIX is an image file format that was used by the BRender 3d engine.

Signed-off-by: Aleksi Nurmi <aleksi.nurmi@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-22 01:06:25 +01:00
Carl Eugen Hoyos
2e08a82d5e Fix the path to the C99-to-C89 Converter & Wrapper to the only existing repository. 
Ronald deleted his public c99-to-c89 repository today.
 2012-11-22 00:46:14 +01:00
Stefano Sabatini
3a0f3ffe8e ffmpeg: fix weird reindent 2012-11-22 00:13:14 +01:00
Stefano Sabatini
02b4ae0427 ffmpeg: print debug_ts off and off_time values with timestamp helper routines 2012-11-22 00:13:14 +01:00
Bojan Zivkovic
e41b518555 mips: Fixing HAVE_MIPSFPU dependencies 
Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reviewed-by: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 23:57:29 +01:00
Peter Ross
bdba96e93c use correct doxygen parameter direction syntax 
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 23:56:15 +01:00
Peter Ross
9ccc349f77 ensure comment blocks that contain doxygen commands start with double asterix 
Reveiwed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 23:55:15 +01:00
Piotr Bandurski
88161b2a52 siff: signal EOF 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 23:52:20 +01:00
Piotr Bandurski
9530439e5f segafilm: signal EOF 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 23:51:21 +01:00
Piotr Bandurski
1ed7ca00dc bethsoftvid: signal EOF 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 23:22:38 +01:00
Piotr Bandurski
425d0888c3 bfi: signal EOF 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 23:22:38 +01:00
Paul B Mahol
8e6957964e yop: fix 10l typo 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-21 20:15:02 +00:00
Michael Niedermayer
b93c933cd2 imgconvert-test: count the number of unused pixel format values. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 20:25:30 +01:00
Michael Niedermayer
fb1bb97d87 imgconvert-test: skip pix formats without name 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 20:25:30 +01:00
Stefano Sabatini
64dc383de5 ffprobe: fix typo in a comment 2012-11-21 20:17:57 +01:00
Stefano Sabatini
6ca9c74cc6 ffprobe: add "," at the end of enum list 2012-11-21 20:17:57 +01:00
Michael Niedermayer
2c5d911166 imgconvert-test: test alpha flags 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 20:07:34 +01:00
Michael Niedermayer
1dafbdac65 pixdesc: fix alpha flags 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 20:07:34 +01:00
Michael Niedermayer
c9ad2e9aa3 imgconvert: remove avg_bits_per_pixel(), its redundant 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 20:07:17 +01:00
Peter Ross
0705cbd002 bink: return AVERROR_EOF upon reaching end of file 
Fixes ticket #1935.

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 19:25:20 +01:00
Michael Niedermayer
60b59d657e codec_descriptors: fix typo in mpeg 2 video 
Found-by: Ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 18:25:01 +01:00
Michael Niedermayer
ea5adf7080 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  flashsv: Drop unused function and struct parameters
  pcm: fix decoding of pcm_s16le_planar on big-endian

Conflicts:
	libavcodec/pcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 18:12:13 +01:00
Michael Niedermayer
b044e81f06 Merge commit 'ae3822bca16f1cdb2460a35b16f8ef636a04314e' 
* commit 'ae3822bca16f1cdb2460a35b16f8ef636a04314e':
  imgconvert: remove PixFmtInfo

Conflicts:
	libavcodec/imgconvert.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 18:03:04 +01:00
Michael Niedermayer
6ff544e473 imgconvert: fix color type for non normal pix_fmts like HW stuff and unused entries. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 17:44:16 +01:00
Michael Niedermayer
6adf97fe00 avcodec_get_pix_fmt_loss: remove PixFmtInfo use 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 17:44:16 +01:00
Michael Niedermayer
fc04c99dea imgconvert: print color type too 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 17:44:16 +01:00
Paul B Mahol
e4e7846db8 cdxl: use url_feof() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-21 16:39:44 +00:00
Michael Niedermayer
f6c4395374 imgconvert: remove PixFmtInfo use from avg_bits_per_pixel() 
This fixes several inconsistencies with YUV >8bit formats caused
due to missing information in the PixFmtInfo table.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 17:06:11 +01:00
Michael Niedermayer
0880f26bbe avcodec_find_best_pix_fmt_of_2: favor formats with fewer components if it does not incur a loss. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 17:06:11 +01:00
Michael Niedermayer
649d8bd8a5 pixdesc: add av_get_padded_bits_per_pixel() 
This will be needed to allow removing the PixFmtInfo table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 17:05:50 +01:00
Michael Niedermayer
ad9333d5ef imgconvert-test: add avg bits per pixel 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 17:03:31 +01:00
Michael Niedermayer
0efa240f2b is_yuv_planar: remove use of PixFmtInfo 
This fixes the behavior for a few yuva 16bit formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 17:03:31 +01:00
Michael Niedermayer
be19e7e373 imgconvert: add self test code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 17:03:31 +01:00
Paul B Mahol
168a7f06de rawenc: cosmetics: reindent 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-21 15:34:45 +00:00
Michael Niedermayer
494945cb66 Merge commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480' 
* commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480':
  avcodec: split avpicture from imgconvert
  pixdesc: add PIX_FMT_ALPHA flag

Conflicts:
	libavcodec/imgconvert.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 15:37:01 +01:00
Xi Wang
0d3123666a cdgraphics: fix incorrect vertical offset mask in cdg_scroll() 
The vertical offset mask 0x07 is suspicious.

    v_off = FFMIN(data[2] & 0x07, CDG_BORDER_HEIGHT - 1);

Note that v_off is up to 11 (CDG_BORDER_HEIGHT - 1), the correct mask
should be 0x0F.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-11-21 14:35:26 +01:00
Xi Wang
b655cfefaf apetag: fix error handling in ff_ape_parse_tag() 
The following error handling is broken due to signedness.

    int file_size;
    uint32_t tag_bytes;
    int64_t tag_start;
    ...
    tag_start = file_size - tag_bytes - APE_TAG_FOOTER_BYTES;
    if (tag_start < 0) { ... }

Note that tag_bytes is unsigned, which makes the right-hand side of
`tag_start = ...' unsigned, too.  The 32-bit unsigned value is then
zero-extended to 64 bits.  Therefore, tag_start must be non-negative,
and the check (tag_start < 0) is always false, which breaks the error
handling.  This patch fixes the check.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-11-21 14:35:26 +01:00
Diego Biurrun
17fecb4a59 flashsv: Drop unused function and struct parameters 2012-11-21 11:49:41 +01:00
Piotr Bandurski
4bf3bc6f96 sierravmd: signal EOF 2012-11-21 10:38:52 +00:00
Paul B Mahol
e94f429474 cafdec: return right code if EOF is reached 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-21 10:34:38 +00:00