RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-16 20:35:23 +00:00
Code Issues Projects Releases Wiki Activity
46,401 Commits 37 Branches 400 Tags 240 MiB
3af7919be4
Commit Graph

46401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefano Sabatini
3af7919be4 add tools/fourcc2pixfmt to .gitignore 2012-11-03 23:40:28 +01:00
Stefano Sabatini
aa48446c9a lavc/xfaceenc: prefer do{}while() over for(){} construct in xface_encode_frame() loop 
Slightly simplify readability, since the initial check is unnecessary.
 2012-11-03 23:35:50 +01:00
Michael Niedermayer
33d54af427 fate: add filmstrip test 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 22:47:14 +01:00
Xidorn Quan
0ecef3a0ef amr_decode_fix_avctx should not return value 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 21:38:37 +01:00
Stefano Sabatini
6450c05ba5 lswr/swresample: adopt globally consistent rules for options help message 
The help text tells what the option does, not what the accepted parameter
is. Thus convert strings of the kind:

Bikeshed Color
to
set bikeshed color
 2012-11-03 20:38:02 +01:00
Stefano Sabatini
0372ecfa48 lavc/options_table: force non-negative bitrate range 
It does not make sense to set a negative bitrate.
 2012-11-03 20:38:02 +01:00
Michael Niedermayer
930226cf52 crystalhd: fix missing braces warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 20:22:53 +01:00
Michael Niedermayer
ab796ded75 avstring: fix compiler warning about freeing const pointers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 20:22:53 +01:00
Nicolas George
73180ecd0a doc/faq: make the -sameq question more explicit. 
Wording suggested by Stefano Sabatini, should have been
merged with the previous commit.
 2012-11-03 17:13:44 +01:00
Nicolas George
8cf6377ac1 doc/faq: explain why -sameq is gone. 2012-11-03 17:03:13 +01:00
Paul B Mahol
94f224516c westwood_aud: remove stale comment 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-03 14:54:17 +00:00
Michael Niedermayer
2581d9bcbb Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: add apidoc target for doxygen API documentation
  matroskadec: do not use avpacket internals

Conflicts:
	doc/Makefile
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 14:48:51 +01:00
Michael Niedermayer
37e81996dc Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f' 
* commit '9221efef7968463f3e3d9ce79ea72eaca082e73f':
  lavf: fix av_interleaved_write_frame() doxy.
  lavf: clarify the lifetime of demuxed packets.
  avconv: do not free muxed packet on streamcopy.
  crc: move doxy to the header
  vf_drawtext: do not use deprecated av_tree_node_size
  x86: Refactor PSWAPD fallback implementations and port to cpuflags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 14:24:11 +01:00
Michael Niedermayer
1885ffb03d Merge commit '9a07c1332cfe092b57b5758f22b686ca58806c60' 
* commit '9a07c1332cfe092b57b5758f22b686ca58806c60':
  parser: Move Doxygen documentation to the header files
  PGS subtitles: Expose forced flag
  x86: PMINUB: port to cpuflags

Conflicts:
	libavcodec/avcodec.h
	libavcodec/pgssubdec.c
	libavcodec/version.h
	libavcodec/x86/ac3dsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 14:13:45 +01:00
Stefano Sabatini
b91fa5fcca lavu/opt: set sample format default value, and accept NULL value 
Fix commit c9eaa98a3e.
+10l.
 2012-11-03 13:53:49 +01:00
Michael Niedermayer
1dad486714 Merge commit '9ce02e14f01de50fcc6f7f459544b140be66d615' 
* commit '9ce02e14f01de50fcc6f7f459544b140be66d615':
  x86: ac3dsp: port to cpuflags
  x86util: Add cpuflags_mmxext alias for cpuflags_mmx2
  x86inc: Only define program_name if the macro is unset

Conflicts:
	libavcodec/x86/ac3dsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 13:38:38 +01:00
Stefano Sabatini
1c755f7667 lavc/options_table: make "request_sample_fmt" an AV_OPT_TYPE_SAMPLE_FMT option 
Simplify, increase robustness in case a new sample format is added.
 2012-11-03 12:15:42 +01:00
Stefano Sabatini
ca11f6b240 lavu/opt: prefer if(){}else{} over if()else{} construct 
Improve consistency.
 2012-11-03 12:14:53 +01:00
Stefano Sabatini
481fdeeecf lavu/opt: add AV_OPT_SAMPLE_FMT option 2012-11-03 12:14:26 +01:00
Stefano Sabatini
7be09a91c2 lswr/swresample.h: use consistent inclusion guard header name 2012-11-03 12:06:43 +01:00
Stefano Sabatini
a62242678f ffmpeg: complain loudly and exit in case removed -sameq option is specified 
This is better than silently ignoring the option, which results in
unexpected quality results.
 2012-11-03 12:05:43 +01:00
Stefano Sabatini
c9eaa98a3e doc/ffmpeg: remove -debug option description 
The option belongs to libavcodec, so it results duplicated in the file.
 2012-11-03 11:01:48 +01:00
Michael Niedermayer
b7280cff9a asfdec: check stream_index for validity 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 05:58:12 +01:00
Michael Niedermayer
e5927910c2 asfdec: flip the interpretation of the header aspect back 
This reverts 2de8877689

Fixes Ticket 1883

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 05:49:07 +01:00
Michael Niedermayer
343c73e252 asfdec: parse aspect ratio payload extension 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 05:49:07 +01:00
Michael Niedermayer
8c93269e42 asfdec: correctly parse payload extensions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 05:37:18 +01:00
Michael Niedermayer
2d8c76eb1f asfdec: parse payload extension list 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 05:35:35 +01:00
Michael Niedermayer
ac2a3a7a05 vf_tinterlace: check av_image_get_linesize() return value 
Fixes CID703717
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 02:38:30 +01:00
Michael Niedermayer
03764f6735 af_earwax: remove unused pointer value 
Fixes CID703849
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 02:38:23 +01:00
Michael Niedermayer
d3dfe99bc5 libgsmdec: fix decoding of non 8khz gsm files 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 00:50:22 +01:00
Michael Niedermayer
6e6033b793 gsmdec: fix decoding of non 8khz gsm files 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 00:50:22 +01:00
Paul B Mahol
20ac916e6d indeo3: release buffer before calling decode_plane 2012-11-02 23:43:23 +00:00
Paul B Mahol
b02116cc4a Revert "Partly revert f174fba: indeo3 decoder does not support direct rendering." 
f174fba did not introduce DR1 flag it was already available before that.

This reverts commit 8bf44d5c96.
 2012-11-02 23:36:57 +00:00
Michael Niedermayer
4ad6ef00a2 libvo-amrwbenc: allow sampling rates other than 16khz 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-02 23:47:58 +01:00
Michael Niedermayer
b30f4510d8 libopencore-amr: allow sampling rates other than 8khz 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-02 23:47:58 +01:00
Michael Niedermayer
0aaf0a07d4 libopencore-amrdec: allow sampling rates other than 8khz 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-02 23:47:58 +01:00
Michael Niedermayer
2c1e9383a2 amrwbdec: allow sample rates other than 16khz 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-02 23:47:58 +01:00
Michael Niedermayer
d8aaec38fc amrnbdec: allow sample rates other than 8khz 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-02 23:47:58 +01:00
Paul B Mahol
f58f600c68 lclenc: make compression level user selectable 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-02 22:14:14 +00:00
Heesuk Jung
25b7aa980b Fix bit_rate in MPEG1/2 Video 
In ISO/IEC 13818-2, bit rate is differently determined according to video type

1) MPEG1 Video
 Bit_rate and vbv_delay are set to 3FFFF and FFFF respectively
 to indicate variable bitrate. Other values are for constant bitrate.
 VBV is only defined for constant bit rate operation.
 Ths STD supersedes the VBV model for vbr.

2) MPEG2 Video
 Even if the bitrate is constant, the value of bit_rate may not be the actual bitrate
 since bit_rate need only be an upper bound to that actual bitrate.
 VBV is only defined for variable bit rate operation.
 Constant bit rate is viewed as a special case of vbr.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-02 22:27:17 +01:00
Paul B Mahol
77d89a5b16 apedec: consume packet after it has been fully decoded 
Timestamp handling of decoded frames are much simpler now.

Fixes #1675.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-02 19:44:49 +00:00
Janne Grunau
b3fab1f2cd doc: add apidoc target for doxygen API documentation 
Documentation includes only the externally visible API of the installed
headers.

Based on a patch by Anton Khirnov <anton@khirnov.net>.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-11-02 18:28:56 +01:00
Anton Khirnov
9221efef79 lavf: fix av_interleaved_write_frame() doxy. 
A sentence was mistakenly inserted in the middle of another sentence.
 2012-11-02 18:28:56 +01:00
Anton Khirnov
34871beb5e matroskadec: do not use avpacket internals 2012-11-02 18:28:56 +01:00
Anton Khirnov
717a450993 lavf: clarify the lifetime of demuxed packets. 2012-11-02 18:28:56 +01:00
Anton Khirnov
c8977f6d26 avconv: do not free muxed packet on streamcopy. 
The packet belongs to lavf, the caller must not free it or access it in
any other way.
No change in practice, since destruct is set to NULL anyway.
 2012-11-02 18:28:56 +01:00
Anton Khirnov
b4dc6dccba crc: move doxy to the header 2012-11-02 18:28:56 +01:00
Anton Khirnov
b68aac7ea3 vf_drawtext: do not use deprecated av_tree_node_size 2012-11-02 18:28:55 +01:00
Paul B Mahol
c39fb30816 smjpegdec: set nb_frames for video stream 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-02 16:32:51 +00:00
Diego Biurrun
0a7a94f2e5 x86: Refactor PSWAPD fallback implementations and port to cpuflags 2012-11-02 17:05:29 +01:00