ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-06 17:53:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,938 Commits 37 Branches 400 Tags 497 MiB
7c94740b84
Commit Graph

31938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Khirnov
d70e512250 cmdutils: allow ':'-separated modifiers in option names. 2011-08-12 13:51:30 +02:00
Anton Khirnov
e6e6060c9b avconv: make -map_metadata work consistently with the other options 
Before, it took an input and output file index, now it only takes an
input file and applies to the next output file.

Stream/chapter/program specification is now part of the option name and
the delimiter was changed from ',' to ':' to be consistent with the
similar feature for AVOptions.
 2011-08-12 13:50:36 +02:00
Anton Khirnov
c9065c2917 avconv: remove deprecated options. 2011-08-12 13:30:38 +02:00
Anton Khirnov
b9aac90bd8 avconv: make -map_chapters accept only the input file index. 
This is consistent with how all the other options work.
 2011-08-12 13:30:07 +02:00
Anton Khirnov
6291d7e416 Make a copy of ffmpeg under a new name -- avconv. 
It will be further developed with a few incompatible changes.

ffmpeg.c will stay as is for some time, so any scripts using it won't be
broken.
 2011-08-12 13:27:30 +02:00
Anton Khirnov
791a86c37a ffmpeg: add a warning stating that the program is deprecated. 2011-08-12 13:27:20 +02:00
Kostya Shishkov
b86ab38137 Add weighted motion compensation for RV40 B-frames 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-11 16:07:58 -07:00
Kostya Shishkov
e5ec68699e RV3/4: calculate B-frame motion weights once per frame 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-11 16:07:23 -07:00
Kostya Shishkov
d241f51e0f Move RV3/4-specific DSP functions into their own context 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-11 16:07:15 -07:00
Dustin Brody
21d7037234 mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-11 16:02:18 -07:00
Dustin Brody
bac3ab13ea h264: notice memory allocation failure 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-11 15:59:07 -07:00
Michael Niedermayer
d912e449b6 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ac3enc: add macros for option names to make them more understandable.
  ac3enc: fix 'channel_coupling' option to actually allow 'auto'.
  cavs: fix some crashes with invalid bitstreams
  ac3enc: clip coupling coordinates during calculation
  Remove incorrect info in documentation of AVCodecContext.bits_per_raw_sample.
  lavc: fix parentheses placement in avcodec_open2().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-11 20:39:20 +02:00
Michael Niedermayer
961a1a81d8 cavsdec: check run value validity 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-11 20:16:27 +02:00
Justin Ruggles
c766eb1ce1 ac3enc: add macros for option names to make them more understandable. 2011-08-11 11:33:32 -04:00
Justin Ruggles
9542ca9fb7 ac3enc: fix 'channel_coupling' option to actually allow 'auto'. 
Use 'auto' as the default value.
 2011-08-11 11:33:32 -04:00
Stefano Sabatini
4ec8685435 indevs.texi: fix typo (builf -> build) 2011-08-11 17:32:54 +02:00
Stefano Sabatini
214357341a lavdev: add libavfilter virtual input device 
This input device is to be considered still experimental, only video
output is supported.
 2011-08-11 17:20:17 +02:00
Stefano Sabatini
e72657f83d lavfi: remove mp test wrapper 
The source was natively integrated into libavfilter, with the name
mptestsrc.
 2011-08-11 16:19:53 +02:00
Stefano Sabatini
1a5e63f924 lavfi: port mp test source 2011-08-11 16:19:48 +02:00
Stefano Sabatini
961e8f31cf vf_mp: sort listing of vf_info_t symbols 
This way it's easier for the programmer to look-up for a specific
symbols (e.g. for checking if it's unused).
 2011-08-11 16:19:19 +02:00
Stefano Sabatini
fe3cad0e9e vf_select: reindent after the previous commit 2011-08-11 16:09:20 +02:00
William Yu
30ea0e47b5 vf_select: add NULL-checks in uninit 
Fix NULL pointer dereference in case of failed initialization.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-08-11 16:09:20 +02:00
Stefano Sabatini
43fab7aafc vf_select: check for isnan when setting t from pts 2011-08-11 16:09:15 +02:00
William Yu
298fccad21 vf_select: set start_t if undefined 
Previously start_t was never set.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-08-11 16:08:55 +02:00
Mans Rullgard
4a71da0f3a cavs: fix some crashes with invalid bitstreams 
This removes all valgrind-reported invalid writes with one
specific test file.

Fixes http://www.ocert.org/advisories/ocert-2011-002.html

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-08-10 22:35:20 +01:00
Justin Ruggles
069083a419 ac3enc: clip coupling coordinates during calculation 
This is faster than using the clip_coefficients() function. Also,
clipping the coordinates before determining reuse is better since it
will compare coordinates that are closer to their final encoded values.
 2011-08-10 17:09:24 -04:00
Justin Ruggles
d271d5b215 Remove incorrect info in documentation of AVCodecContext.bits_per_raw_sample. 
bits_per_raw_sample is used in video as well, where sample_fmt is not used.
 2011-08-10 15:40:52 -04:00
Clément Bœsch
9acffed9e0 oggenc: add missing initializer braces to shut up gcc warning. 
This fixes the warning:
    libavformat/oggenc.c:75:7: warning: missing braces around initializer [-Wmissing-braces]
 2011-08-10 21:03:39 +02:00
Clément Bœsch
df2039f573 avidec: add missing initializer braces to shut up gcc warning. 
This fixes the warning:
    libavformat/avidec.c:81:5: warning: missing braces around initializer [-Wmissing-braces]
 2011-08-10 21:02:32 +02:00
Clément Bœsch
afd7e46bd4 alsa: remove too unused variables. 
This fixes the two following warnings:
    libavdevice/alsa-audio-dec.c:62:26: warning: unused variable ‘sw_params’ [-Wunused-variable]
    libavdevice/alsa-audio-dec.c:109:15: warning: unused variable ‘st’ [-Wunused-variable]
 2011-08-10 20:52:41 +02:00
Reimar Döffinger
0399044805 Always pass a AVFormatContext to av_log. 
This is consistent, allows custom handlers to print more info
(since they probably know about the AVFormatContext class
but not a demuxer-specific one) and also avoids issues due
to the class pointer being NULL for non-raw mpegts.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-08-10 20:39:50 +02:00
Michael Niedermayer
9f06c1c61e cavsdec: avoid possible crash with crafted input 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-10 17:29:51 +02:00
Baptiste Coudurier
1d36fb13b0 lavc: fix parentheses placement in avcodec_open2(). 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-10 16:57:33 +02:00
Michael Niedermayer
a9aa88df1d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: make avcodec_init() static on next bump.
  ac3enc: remove unneeded #include
  ac3enc: restructure coupling coordinate reuse calculation
  ac3enc: allow new coupling coordinates to be sent independently for each channel.
  ac3enc: separate exponent bit counting from exponent grouping.
  h264: propagate error return values for AV_LOG_ERROR-triggering events
  aac: Don't attempt to output configure an invalid channel configuration.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-10 16:29:51 +02:00
Michael Niedermayer
e2cc331124 NoMerge commit '4d58e4cb4ca8e04317fecea432ea3272a445877c' 
* commit '4d58e4cb4ca8e04317fecea432ea3272a445877c':
  Rename ffserver to avserver.
  Rename ffprobe to avprobe.
  Rename ffplay to avplay.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-10 16:29:20 +02:00
Clément Bœsch
51fb933dd0 timecode: move dropframe code and doxycomment it. 
This is based on the original work by Baptiste Coudurier.
 2011-08-10 16:00:32 +02:00
Clément Bœsch
5231454560 timecode: introduce timecode and honor it in MPEG-1/2. 
This is based on the original work by Baptiste Coudurier.
 2011-08-10 16:00:32 +02:00
Clément Bœsch
78da04384a options: handle options with the same name in codecs and formats. 
This will allow the incoming -timecode option to be handled in both
encoders (mpeg12enc in that case) and demuxers (dv, mxf, etc.).
 2011-08-10 16:00:32 +02:00
Michael Niedermayer
6481a36010 cavs: fix oCERT #2011-002 FFmpeg/libavcodec insufficient boundary check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-10 13:28:36 +02:00
Anton Khirnov
7221139ba0 lavc: make avcodec_init() static on next bump. 
It's called from avcodec_register() anyway, so there's no reason for it
to be public.
 2011-08-10 12:49:57 +02:00
Justin Ruggles
d1d33e0763 ac3enc: remove unneeded #include 2011-08-09 16:44:34 -04:00
Justin Ruggles
fce33f9ead ac3enc: restructure coupling coordinate reuse calculation 2011-08-09 16:44:34 -04:00
Justin Ruggles
c3d63262fe ac3enc: allow new coupling coordinates to be sent independently for each 
channel.
 2011-08-09 16:44:34 -04:00
Justin Ruggles
d55ad59a8a ac3enc: separate exponent bit counting from exponent grouping. 
Move bit counting to the bit allocation function. Move exponent grouping to
after bit allocation. This will allow for adjustment of bandwidth parameters
during bit allocation without having to do exponent grouping multiple times.
 2011-08-09 16:28:18 -04:00
Michael Niedermayer
0d4ea7b324 lavc: bump minor for Go2Meeting codec ID 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-09 22:11:08 +02:00
Thierry Foucu
63377695a6 AVCodecTag: Add MKTAG for Go2Meeting video codec 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-09 21:53:48 +02:00
Thierry Foucu
2a41701300 AVCodec: Add Go2Meeting codec ID 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-09 21:53:38 +02:00
Marton Balint
c369ddb720 ffplay: pass frame durations clearly to video video_refresh 
Previously the target clock of the next frame was calculated by using video_clock
which is modified from another thread...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-09 21:53:15 +02:00
Dustin Brody
12fe759423 h264: propagate error return values for AV_LOG_ERROR-triggering events 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-09 12:29:13 -07:00
Alex Converse
94d47382e0 aac: Don't attempt to output configure an invalid channel configuration. 2011-08-09 12:16:40 -07:00