RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
32,787 Commits 36 Branches 392 Tags 310 MiB
Commit Graph

32787 Commits

Author SHA1 Message Date
Lou Logan e116d15cc4 presets: use private options in libx264-ipod ffpresets 
Change flags2 options to supported libx264 private options.
 2011-09-22 06:27:07 +02:00
Jonne Ahner 8a73246391 prores: skip alpha if present 2011-09-22 06:26:52 +02:00
Stefano Sabatini 3a87dce6bf vf_drawtext: remove useless and misnamed intermediary "baseline" variable in draw_text() 2011-09-22 00:45:59 +02:00
Stefano Sabatini 500b3210da vf_drawtext: fix background box coloring with RGB formats != RGBA 
drawbox() expects a color specified in RGBA format, while the code was
providing a color with the components specified in the same order of
the input pixel format.

In particular, fix box coloring with AXXX RGB formats.
 2011-09-22 00:45:59 +02:00
Stefano Sabatini db56a7507e vf_drawtext: prefer int over unsigned int 
This avoids overflow errors when the considered x and y values are
negative, as required by the incoming patches.
 2011-09-22 00:45:59 +02:00
Stefano Sabatini 751df79d29 vf_drawtext: use @itemize environment for showing examples in docs 
Beautify.
 2011-09-22 00:45:59 +02:00
Laurent Aimar 7c249d4fba Check for huffman tree building error in vp6 decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-22 00:42:28 +02:00
Laurent Aimar dba20b8478 Release old pictures after a resolution change in vp5/6 decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-22 00:42:28 +02:00
Laurent Aimar 6a0e78929a Check for missing reference in vp5/6 decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-22 00:42:28 +02:00
Laurent Aimar b64269ce55 Check for invalid slices offsets in RV30/40 decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-22 00:42:28 +02:00
Laurent Aimar 741ec30bd2 Check output buffer size in nellymoser decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-22 00:42:28 +02:00
Clément Bœsch 00320ac0dd ffprobe: remove misplaced and pointless comment. 2011-09-22 00:22:53 +02:00
Clément Bœsch b70fd6fa8b ffprobe: use av_get_pix_fmt_name() instead of accessing av_pix_fmt_descriptors. 2011-09-22 00:22:53 +02:00
Clément Bœsch 03d0ea0cf0 ffprobe: remove media_type_string() by inlining av_x_if_null(). 2011-09-22 00:22:53 +02:00
Clément Bœsch a70e787410 lavu: add av_x_if_null(). 2011-09-22 00:22:52 +02:00
Carl Eugen Hoyos 3039c68626 Fix dxva2 decoding for some H264 samples. 2011-09-21 23:42:03 +02:00
Carl Eugen Hoyos e71322cb00 Support Sorenson Spark in f4v. 
Such files are produced by the Flash Media Server,
see samples/f4v/H263_NM_f.mp4
 2011-09-21 23:42:03 +02:00
Carl Eugen Hoyos d5d027682c Use the parser for AC-3 in mov. 
Fixes ticket #494.
 2011-09-21 23:42:03 +02:00
Michael Niedermayer 3e1a7ae44a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  swfdec: Add support for sample_rate_code 0 (5512 Hz)
  dct-test: factor out some common code and do whas was likely intended
  doc: library versions need to be bumped in version.h
  Revert "ffmpeg: get rid of useless AVInputStream.nb_streams."
  Remove some forgotten AVCodecContext.palctrl usage.
  lavc/utils: move avcodec_init() higher in the file.
  lavc: replace some deprecated FF_*_TYPE with AV_PICTURE_TYPE_*
  ac3dec: actually use drc_scale private option
  lavc: undeprecate AVPALETTE_SIZE and AVPALETTE_COUNT macros
  alsa: add missing header
  msmpeg4: remove leftover unused debug variable declaration
  Fix assert() calls that need updates after FF_COMMON_FRAME macro elimination.
  Fix av_dlog invocations with wrong or missing logging context.
  vf_yadif: add support to yuva420p
  vf_yadif: correct documentation on the parity parameter
  vf_yadif: copy buffer properties like aspect for second frame as well
  oma: support for encrypted files
  id3v2: add support for non-text and GEOB type tag frames
  des: add possibility to calculate DES-CBC-MAC with small buffer

Conflicts:
	ffmpeg.c
	libavcodec/dct-test.c
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-21 21:25:43 +02:00
Alex Converse 05fc9e40a4 swfdec: Add support for sample_rate_code 0 (5512 Hz) 2011-09-21 09:42:35 -07:00
Mans Rullgard ae2e89717b dct-test: factor out some common code and do whas was likely intended 
This fixes some nonsensical code by moving some should-be-shared
code to separate functions and using these.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-09-21 15:43:59 +01:00
Diego Biurrun dd8d808ba6 doc: library versions need to be bumped in version.h 2011-09-21 14:57:29 +02:00
Anton Khirnov 9aa1f87dfd Revert "ffmpeg: get rid of useless AVInputStream.nb_streams." 
This reverts commit 2cf8355f98.
AVInputStream.nb_streams tracks number of streams found at the
beginning, new streams may appear that ffmpeg doesn't know about. Fixes
crash in this case.
 2011-09-21 14:12:00 +02:00
Anton Khirnov 609a2fa1fa Remove some forgotten AVCodecContext.palctrl usage. 2011-09-21 13:51:53 +02:00
Anton Khirnov 9ecfbb3e57 lavc/utils: move avcodec_init() higher in the file. 
Fixes build on next major bump.
 2011-09-21 13:51:53 +02:00
Anton Khirnov e5b29c1f6b lavc: replace some deprecated FF_*_TYPE with AV_PICTURE_TYPE_* 2011-09-21 13:51:53 +02:00
Anton Khirnov feedc0754b ac3dec: actually use drc_scale private option 2011-09-21 13:51:53 +02:00
Anton Khirnov 63e4c8a653 lavc: undeprecate AVPALETTE_SIZE and AVPALETTE_COUNT macros 
They are still being used and shouldn't be removed.
 2011-09-21 13:51:53 +02:00
Anton Khirnov 4d77d57d20 alsa: add missing header 
Fixes compile with next lavc major.
 2011-09-21 13:51:53 +02:00
Diego Biurrun a3e0135dbb msmpeg4: remove leftover unused debug variable declaration 2011-09-21 09:57:33 +02:00
Diego Biurrun 95a06eb4d5 Fix assert() calls that need updates after FF_COMMON_FRAME macro elimination. 
This fixes build failures with -DDEBUG in CPPFLAGS.
 2011-09-21 09:57:32 +02:00
Diego Biurrun 35a6855868 Fix av_dlog invocations with wrong or missing logging context. 
This fixes build failures with -DDEBUG in CPPFLAGS.
 2011-09-21 09:57:32 +02:00
Stefano Sabatini be4e8908d2 vf_yadif: add support to yuva420p 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-21 09:00:24 +02:00
Stefano Sabatini 4703a7b50b vf_yadif: correct documentation on the parity parameter 
0 is top-field-first, 1 is bottom-field-first, not the other way
around.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-21 08:59:58 +02:00
Joakim Plate 5feb67f8a1 vf_yadif: copy buffer properties like aspect for second frame as well 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-21 08:59:36 +02:00
David Goldwich 61f4387d39 oma: support for encrypted files 
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-21 08:33:15 +02:00
David Goldwich 7a019dffe5 id3v2: add support for non-text and GEOB type tag frames 
This extends the ID3v2 parser to allow for reading of non-text (i.e.
other than T***) meta tag frames providing a ff_id3v2_read_all()
function. An additional data structure 'ID3v2ExtraMeta' is introduced
for these tags since AVDictionary is string oriented and unsuitable
for binary data.

A parser for tag frames of type GEOB is implemented, which is needed
to extract keyring information from encrypted OMA files. GEOB data
is parsed into 'ID3v2ExtraMetaGEOB' data structures.

The routine to decode characters from different encodings to UTF-8,
formerly part of the read_ttag() function, is moved to its own
function. Because some tag frames contain subparts of unknown length,
the function is now also able to read until a null character is found.
In addition, the function now takes care of allocating a buffer long
enough to hold the decoded characters.

Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-21 08:28:21 +02:00
David Goldwich b3e144a7df des: add possibility to calculate DES-CBC-MAC with small buffer 
This patch adds the possibility to calculate the DES-CBC-MAC of a
source buffer (i.e. the last block of the buffer encrypted in CBC
mode) without having to allocate a destination buffer that is as
long as the complete source buffer, but instead only 8 bytes
for the MAC.

Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-21 08:28:20 +02:00
Michael Niedermayer 358d837dad prores: Add forgotten Copyright statements 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-21 04:03:51 +02:00
Michael Niedermayer 7cb5def1f3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtmp: Don't blindly skip the 4 trailer bytes from the FLV packets
  rtmp: Handle FLV packets written in more than one write call
  rv34: Check for invalid slice offsets

Conflicts:
	libavformat/rtmpproto.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-21 01:05:36 +02:00
Michael Niedermayer c83442b057 mp3demux: pass on error code on packet read. 
Reported-by: Tanami, Ohad
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-21 00:51:53 +02:00
Michael Niedermayer 743e1df5c2 prores: Simplify code further 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-21 00:08:53 +02:00
Jonne Ahner ecb0edd9d7 prores: simplify 4444 handling 2011-09-20 23:55:01 +02:00
Jonne Ahner d673972d30 prores: fixes a few prores 4444 samples 2011-09-20 22:46:36 +02:00
Jonne Ahner 989c02825e prores: use shift instead of multiply 2011-09-20 22:46:17 +02:00
Martin Storsjö 847052db34 rtspdec: Require TCP-interleaved RTP packets to be at least 11 bytes, instead of 12. 
(A minimal RTP packet is 12 bytes, but a minimal RTCP packet can be
much smaller, at least as small as 8 bytes.)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-20 21:58:15 +02:00
Yuriy Kaminskiy 2b2617da6b libpostproc: mmx code uses stack below %esp, fix that 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-20 21:37:00 +02:00
Reimar Döffinger 0bbb1cdc28 Use correct LOCAL_ALIGNED for stack variables instead of DECLARE_ALIGNED. 
LOCAL_ALIGNED should work for all compilers/systems whereas
DECLARE_ALIGNED does not work on some (do not remember which though).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-09-20 19:05:51 +02:00
Reimar Döffinger b9acca288e Remove unused variable. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-09-20 19:05:51 +02:00
Reimar Döffinger c928e91729 Hack around gcc 4.6 breaking asm using call. 
gcc 4.6 no longer decrements esp to account for local variables.
Thus using call will end up overwriting some local variable.
So add an extra one it can safely clobber.
This is a huge hack because it's basically pure chance it works,
no idea how this is supposed to be done.

Fixes trac ticket #397.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-09-20 19:05:51 +02:00