virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
46,163 Commits 37 Branches 400 Tags 458 MiB
cd37963684
Commit Graph

46163 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
cd37963684 Merge commit '381dc1a5ec0925b281c573457c413ae643567086' 
* commit '381dc1a5ec0925b281c573457c413ae643567086':
  fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups
  fate: Add shorthands for acodec PCM and ADPCM tests
  avconv: Drop unused function argument from do_video_stats()
  cmdutils: Conditionally compile libswscale-related bits
  aacenc: Drop some unused function arguments
  rtsp: Avoid a cast when calling strtol
  nut: support textual data
  nutenc: verbosely report unsupported negative pts

Conflicts:
	cmdutils.c
	ffmpeg.c
	libavformat/nut.c
	libavformat/nutenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-30 13:52:03 +01:00
Michael Niedermayer
60e957476e rawdec: check avpicture_get_size() return value 
Fixes CID205019
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-30 13:18:57 +01:00
Carl Eugen Hoyos
d3de3a16d1 Partly revert f174fba: yop decoder does not support direct rendering. 2012-10-30 12:09:25 +01:00
Carl Eugen Hoyos
8bf44d5c96 Partly revert f174fba: indeo3 decoder does not support direct rendering. 2012-10-30 11:51:58 +01:00
Paul B Mahol
5f614bcf2c vqavideo: return more meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-30 03:29:08 +00:00
Michael Niedermayer
4b7f34a34e mpeg12videodec: dont pass mpeg1 VBR special case value on as bitrate. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-30 02:27:50 +01:00
Heesuk Jung
c349177b8c mpeg12video_parser: Wrong bit rate in MPEG2 video file (Ticket #1862) 
mpegvideo parser sometime get wrong stream bit rate which is 0x3FFFF*400.
But maximum bit rate of MPEG2 video is up to 80 Mbps in case 1920x1080 resolution.
When bit rate is 0x3FFFF*400, set bit rate zero.

* Problematic link
https://docs.google.com/open?id=0B6r7ZfWFIypCUkhPa0dyTGdFSE0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-30 02:19:52 +01:00
Michael Niedermayer
740959fdbf mpeg12parser: cleanup bitrate parsing. 
This fixes several bugs in the code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-30 02:19:21 +01:00
Michael Niedermayer
11d695d120 x11grab: fix mixed declaration and code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-29 22:24:10 +01:00
Michael Niedermayer
977cb54f94 tree: fix type used for testing the tree 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-29 22:21:25 +01:00
Michael Niedermayer
1838961357 qt-faststart: fix signedness of variable used to hold return code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-29 22:11:22 +01:00
Michael Niedermayer
91295f03d4 mp3dec: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-29 22:11:21 +01:00
Michael Niedermayer
ba8adf9be5 truemotion2: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-29 22:11:19 +01:00
Piotr Bandurski
bf0d098a98 pictordec: decode 1bpp / 4bpp images when extra header marker is missing 
based on 56f6628bca

samples:

http://www.datafilehost.com/download-94b5bc1b.html

Reviewed-and-Tested-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-29 21:32:03 +01:00
Piotr Bandurski
a29ed50ed7 avuidec: correct long_name 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-29 21:13:50 +01:00
Paul B Mahol
9051025102 lavc: remove duplicated .capabilities 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-29 20:06:52 +00:00
Diego Biurrun
381dc1a5ec fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups 2012-10-29 19:07:58 +01:00
Diego Biurrun
e519990ced fate: Add shorthands for acodec PCM and ADPCM tests 2012-10-29 19:07:58 +01:00
Diego Biurrun
70478746a9 avconv: Drop unused function argument from do_video_stats() 2012-10-29 19:07:58 +01:00
Diego Biurrun
ab79966475 cmdutils: Conditionally compile libswscale-related bits 
This fixes compilation with libswscale disabled.
 2012-10-29 19:02:12 +01:00
rogerdpack
c1804dc4ce lavfi/frei0r: allow for Windows style paths 
Update path handling against the latest Frei0r specification changes.

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2012-10-29 18:50:48 +01:00
Stefano Sabatini
7691860c73 lavfi/frei0r: update link to spec 
Fri0r project moved from piksel.org to frei0r.dyne.org.
 2012-10-29 18:48:00 +01:00
Diego Biurrun
72c758f1fd aacenc: Drop some unused function arguments 2012-10-29 18:27:54 +01:00
Stefano Sabatini
19add3224f lavfi/scale: implement clever/insane parsing heuristic, and add a size option 
If the first argument can be read as a video size, set that output size
in the scale. This allows to specify in a filtergraph scale=qcif or
scale=320x240.

This is not completely safe, for example in case of a typo in the video
size string the first argument will be read as the input width
expression, giving rise to a confusing comment.
 2012-10-29 17:44:53 +01:00
Stefano Sabatini
d4604d10fe lavu/parseutils: add trailing characters check in av_parse_video_size() 
Return an error in case the video size specifications contains spurious
trailing chars, like in "320x240foobar".
 2012-10-29 17:39:26 +01:00
Stefano Sabatini
adf0cd1456 doc/filters: itemize scale examples, and create a dedicated subsection for them 2012-10-29 17:39:26 +01:00
Stefano Sabatini
c2428ada71 lavfi/scale: return error code in case of failed reconfiguration in start_frame() 
Avoid an assert, since now the function supports error code return.
 2012-10-29 17:39:26 +01:00
Stefano Sabatini
83938c3d4c lavfi/scale: accept named options, make parsing more robust 
Also update documentation accordingly.
 2012-10-29 17:39:26 +01:00
Martin Storsjö
f21d5c905d rtsp: Avoid a cast when calling strtol 
This gets rid of this warning:

libavformat/rtsp.c: In function ‘rtsp_parse_transport’:
libavformat/rtsp.c:794: warning: cast discards qualifiers from pointer target type

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-29 17:47:25 +02:00
Tim Nicholson
8a9b48bfa9 movenc: Add required 'prof' atom to 'tapt' atom set. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-29 16:45:37 +01:00
Michael Niedermayer
67420b3de5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: add CODEC_CAP_DR1 to all video decoders missing them
  rtpdec: Cosmetic cleanup

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-29 13:15:27 +01:00
Luca Barbato
d4bff9f1ab nut: support textual data 
Plain text (utf8 encoded) data can be muxed and demuxed in nut.
 2012-10-29 12:03:28 +01:00
Stefano Sabatini
7d1e003abd doc/syntax: add a "Quoting and escaping" section 2012-10-29 11:56:15 +01:00
Luca Barbato
07585ffa62 nutenc: verbosely report unsupported negative pts 
Additionally use the correct error number.
 2012-10-29 10:52:13 +01:00
Anton Khirnov
f174fbac3c lavc: add CODEC_CAP_DR1 to all video decoders missing them 2012-10-29 09:51:23 +01:00
Michael Niedermayer
b4e6265136 dcadec: skip QMF on unused channels 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-29 05:21:47 +01:00
Michael Niedermayer
a3886ea3c5 smoothstreamingenc: check return value of mkdir() 
Fixes CID732188
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-29 03:34:17 +01:00
Michael Niedermayer
b399816d9c smoothstreamingenc: fix integer overflow 
Fixes CID732248
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-29 03:17:08 +01:00
Michael Niedermayer
224afddc7c ismindex: check return value of avio_open_dyn_buf() 
Fixes CID733723
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-29 02:53:43 +01:00
Leon van Stuivenberg
c5be6192f0 cmdutils: avoid using cpp directives within printf macro arguments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

It appears such construct has undefined behavior
 2012-10-29 01:03:02 +01:00
Paul B Mahol
c2e2b3029e cafdec: fix parsing of chunks which may have unused data 
Specification mentions 'strg', 'mark', 'regn', 'info', .. chunks
to have data section size larger than chunk's current meaningful
content in order to reserve room for additional data.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-28 20:33:29 +00:00
Clément Bœsch
3d6a246b4b lavf/srtenc: add AVFMT_TS_NONSTRICT flag. 
There is not really a problem in having two events at the same time.
Even if it's not perfectly correct, it helps remuxing more files
(typically our FATE sample).
 2012-10-28 20:45:58 +01:00
Martin Storsjö
48f01398ba rtpdec: Cosmetic cleanup 
Mainly clean up the RTP statistics code, plus a few other obviously
misindentend lines.

Remove some useless comments, de-doxygenize some comments,
add spacing around operators and fix a typo.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-28 20:50:01 +02:00
Michael Niedermayer
d41c019da0 fate/scalenorm: unbreak fate 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-28 18:26:11 +01:00
Stefano Sabatini
74e81b4de1 tests: do not set bogus scale sws_flags option in the scalenorm test 
sws_flags is not a valid scale option, and thus is ignored.
 2012-10-28 17:20:50 +01:00
Michael Niedermayer
f472d01c25 frame_thread_encode: fix context memleak 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-28 17:04:11 +01:00
Michael Niedermayer
991db63951 frame_thread_encoder: fix packet memleak 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-28 16:47:23 +01:00
Michael Niedermayer
d8246d475c vc1dec: mark by assert that the default path cannot occur 
Fixes CID703827, CID703828
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-28 16:11:14 +01:00
Paul B Mahol
07ed191b15 parse ID3v2 chapters 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-28 15:10:28 +00:00
Carl Eugen Hoyos
3f44809415 Synchronize libmpcodecs: Support 16bit yuv in telecine filter. 
Fixes ticket 1782.
 2012-10-28 15:46:35 +01:00