Michael Niedermayer
48a40e09c4
ffmpeg: fix warning & bug for keep_pix_fmt
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-19 00:23:56 +02:00
Clément Bœsch
7f8bd16103
ffmpeg: remove unused variable i.
2012-05-18 23:40:59 +02:00
Clément Bœsch
9e2cee5770
ffmpeg: do not deprecate -vol and -map_channel.
...
These helpers are handy, just notice the user it is done using lavfi.
2012-05-18 23:40:03 +02:00
Clément Bœsch
fa29ca5f55
ffmpeg: resurrect -map_channel.
2012-05-18 23:40:03 +02:00
Clément Bœsch
48f30595f5
pan: use ff_parse_channel_layout() instead of av_get_channel_layout().
...
This allow specifying hexadecimal channel layout, and also handle the
error printing internally.
2012-05-18 23:34:11 +02:00
Clément Bœsch
7c2bb79f3b
lavu/error: fix make checkheaders.
...
The errors need to be defined before including functions depending on
them. See av_size_mult() for instance. stddef.h is included for the
prototype of av_sterror (use of size_t).
2012-05-18 23:34:11 +02:00
Clément Bœsch
1913989f56
build: add codec_names.h to SKIPHEADERS to fix make checkheaders.
2012-05-18 23:34:11 +02:00
Clément Bœsch
3dba3b265c
lavc/vda: fix make checkheaders.
2012-05-18 23:34:11 +02:00
Clément Bœsch
08ad9f9a78
lavc/os2threads: fix make checkheaders.
2012-05-18 23:34:11 +02:00
Clément Bœsch
b56f885a24
lavc/libutvideo: fix make checkheaders.
2012-05-18 23:34:11 +02:00
Clément Bœsch
5b70e28c6e
lavc/libutvideo: protect header.
2012-05-18 23:34:11 +02:00
Clément Bœsch
c8a7dd03f8
lavc/jacosub: fix make checkheaders.
2012-05-18 23:34:11 +02:00
Clément Bœsch
9ae47fbd9e
lavc/dcaenc: fix make checkheaders.
2012-05-18 23:34:11 +02:00
Clément Bœsch
978c829431
lavc/g723.1: fix make checkheaders.
2012-05-18 23:34:11 +02:00
Clément Bœsch
02908a4bd0
lavc/g723: protect header.
2012-05-18 23:34:11 +02:00
Clément Bœsch
7b78cb3a70
lavc/g729postfilter: fix make checkheaders.
2012-05-18 23:34:11 +02:00
Clément Bœsch
1308fa42ad
lavf/swf: fix make checkheaders.
2012-05-18 23:34:11 +02:00
Clément Bœsch
64ff8a7670
lavfi: rename all_channel_layouts.h to all_channel_layouts.inc.
...
all_channel_layouts.h is not a real header file and breaks make checkheaders.
2012-05-18 23:34:11 +02:00
Clément Bœsch
f8f3deb731
lavfi/transform: fix make checkheaders.
2012-05-18 23:34:11 +02:00
Clément Bœsch
cb9aed10f7
lavd/dshow: fix make checkheaders.
2012-05-18 23:34:11 +02:00
Clément Bœsch
d1562d32cf
lavd/dshow: protect header.
2012-05-18 23:34:11 +02:00
Michael Niedermayer
96ac8663de
af_aresample: Consider the swresample delay during calculating timestamps.
...
The difference from this should be pretty small.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-18 23:03:27 +02:00
Michael Niedermayer
4def5d2b64
swr: add swr_get_delay() to find the exact delay the swresampler introduces.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-18 23:02:10 +02:00
Michael Niedermayer
6ba692f8a7
af_aresample: fix rounding that led to sample accumulation in the buffers.
...
This fixes a regression that apparently was missed when switching to the
in af resampler
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-18 22:57:02 +02:00
Anton Khirnov
39885a4bd7
avconv: reindent
2012-05-18 19:41:58 +02:00
Anton Khirnov
74b961db77
avconv: replace -vsync cfr code with the fps filter.
...
Invented timestamps for the h264 tests return to something resembling
sanity.
In the idroq-video-encode test when converting 25 fps -> 30 fps the
fifth frame gets duplicated instead of the sixth.
2012-05-18 19:38:40 +02:00
Anton Khirnov
755cd4197d
mov: enable parsing for VC-1.
...
This makes lavf discard broken timestamps for non-B frames in
samples/isom/vc1-wmapro.ism.
2012-05-18 19:38:21 +02:00
Anton Khirnov
54c5dd89e3
lavfi: Add fps filter.
...
Partially based on a patch by Robert Nagy <ronag89@gmail.com>
2012-05-18 19:33:54 +02:00
Anton Khirnov
7b3b24a8ee
lavfi: initialize pts to AV_NOPTS_VALUE when creating new buffer refs.
2012-05-18 19:29:39 +02:00
Anton Khirnov
0ad26cdf24
avconv: add support for audio in complex filtergraphs.
2012-05-18 19:27:00 +02:00
Diego Biurrun
90c9edba58
doc: Replace some @file tags by more suitable markup.
2012-05-18 16:08:41 +02:00
Diego Biurrun
1afc278994
fate: Set FUZZ factor of vorbis-13 test to 2.
...
This is necessary to account for different rounding done in the 3DNow!
Assembly optimizations.
2012-05-18 16:08:41 +02:00
Diego Biurrun
4cc8e15371
fate: Set FUZZ factor of (e)ac3-encode test to 3.
...
This is necessary to account for different rounding done in the 3DNow!
Assembly optimizations.
2012-05-18 16:08:40 +02:00
Nicolas George
c0c2424f73
fate: ffprobe tests require SAMPLES.
2012-05-18 15:19:03 +02:00
Mans Rullgard
ab5c38ec45
fate: remove unused code from regressions-funcs.sh
...
The only uses of the do_avconv_nomd5() function were removed in
85cf49f
.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-05-18 14:00:36 +01:00
Michael Niedermayer
ae1ab8265b
Merge remote-tracking branch 'cus/stable'
...
* cus/stable:
ffplay: put aspect ratio info to the VideoPicture struct
ffplay: use AVFrame::width and height instead of using codec or filter settings
ffplay: use stream sample_aspect_ratio if available in source frames
ffplay: fix video_thread when no frame is returned in get_video_frame
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-18 04:45:18 +02:00
Michael Niedermayer
db6ef054f5
af_aresample: 10l fix, wrong timebase for next_pts.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-18 04:45:08 +02:00
Stefano Sabatini
17d4233c9c
lavfi/aevalsrc: reindent after the previous commit
2012-05-18 00:59:42 +02:00
Stefano Sabatini
e1a8df70a2
lavfi/aevalsrc: add option channel_layout
...
Allow to explicitly specify the channel layout to select.
2012-05-18 00:58:41 +02:00
Stefano Sabatini
cfde7395b1
lavfi/aevalsrc: remove limitation on the number of channels
2012-05-18 00:38:31 +02:00
Stefano Sabatini
47ef261288
lavu/parseutils: fix specification for av_parse_time()
2012-05-18 00:38:06 +02:00
Michael Niedermayer
de2cfb744a
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
pcmenc: set correct bitrate value
avprobe: don't print format entry name when only one was requested
Conflicts:
ffprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-17 23:45:00 +02:00
Michael Niedermayer
847943bc51
aresample: add code to flush the internal swr buffer.
...
Inspired-by code from af_resample.c written by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-17 22:45:05 +02:00
Michael Niedermayer
b3e1b95afa
aresample: check return code of swr_convert()
...
Issue found by comparing af_resample.c and af_aresample.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-17 22:44:28 +02:00
Martin Storsjö
4b7304e80d
rtmp: Don't assume path points to a string of nonzero length
...
If using the new -rtmp_app and -rtmp_playpath parameters,
one can in many cases set the main url to just rtmp://server/.
If the trailing slash is omitted, path is a string of zero length,
and using path+1 will end up reading uninitialized data.
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-05-17 21:16:52 +03:00
Anton Khirnov
01e98b1b00
avconv: fix behavior with -ss as an output option.
...
Don't return from poll_filters() immediately, there may be other frames
and/or other streams to handle.
Fixes a memleak.
2012-05-17 19:37:58 +02:00
Clément Bœsch
a99a3b1bb3
ffmpeg: automatically insert volume filter when -vol is used.
...
Deprecate -vol.
Inspired by asyncts auto-insert patch from Anton Khirnov.
2012-05-17 17:37:18 +02:00
Michael Niedermayer
22a3a5ee0c
ffmpeg: use av_buffersrc_add_frame() for audio too
...
fixes a memleak
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-17 17:19:35 +02:00
Michael Niedermayer
dc2e051c4f
Merge branch 'audio-filters' of https://github.com/ubitux/FFmpeg
...
* 'audio-filters' of https://github.com/ubitux/FFmpeg :
lavfi/pan: add supported sample rates to avoid a crash.
ffmpeg: do not warn when expecting EOF from lavfi.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-17 16:55:01 +02:00
Michael Niedermayer
b13d39bd81
av_aresample: Allow changing sample format and channel layout as well
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-17 16:46:15 +02:00