Nicolas George
e0545262a2
amerge: accept multiple inputs.
2012-06-07 22:51:08 +02:00
Nicolas George
e8e492b302
af_amerge: move nb_in_ch into the in structure.
...
With that change, there is only one array for the inputs,
it will make easier to implement a variable number of inputs.
2012-06-07 22:28:32 +02:00
Nicolas George
e45a92dc88
audioconvert: implement av_bprint_channel_layout().
...
And reimplement av_get_channel_layout_string() on top of it.
2012-06-07 22:28:32 +02:00
Nicolas George
7a2b429175
fate: add bprint test.
2012-06-07 22:28:32 +02:00
Nicolas George
b3e2bb08a9
bprint: add av_bprint_init_for_buffer().
2012-06-07 22:28:32 +02:00
Nicolas George
9148ae5b91
opt: add test for IMAGE_SIZE and PIXEL_FMT.
2012-06-07 22:13:59 +02:00
Nicolas George
61c266d72f
opt: free test_ctx.string at the end.
...
Makes valgrind happy.
2012-06-07 22:13:59 +02:00
Nicolas George
42b774ab6f
opt: init test_ctx to 0.
...
Otherwise, setting string will try to free a random address.
2012-06-07 22:13:59 +02:00
Nicolas George
d9b0d75c56
opt: add AV_OPT_TYPE_PIXEL_FMT.
2012-06-07 22:13:59 +02:00
Michael Niedermayer
9f7b014ad3
Merge remote-tracking branch 'cus/stable'
...
* cus/stable:
ffplay: fix build if avfilter is disabled
ffplay: fix frame_delay calculation in new avfilter code
ffplay: add support for changing pixel format
ffplay: add missing filt_in assignment after video filter reconfigure
ffplay: fix frame aspect ratio after qatar merge
ffplay: fix use after free
ffplay: use dummy video driver if display is disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07 21:55:34 +02:00
Michael Niedermayer
67732b9d62
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpegts: Remove disabled extension matching probe.
fate: avoid freopen(NULL) in videogen/rotozoom
Conflicts:
tests/rotozoom.c
tests/videogen.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07 21:45:52 +02:00
Michael Niedermayer
b4d44367bc
h261enc: use av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07 21:32:32 +02:00
Michael Niedermayer
07732b4f09
h261dec: use av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07 21:31:22 +02:00
Michael Niedermayer
a21c212681
swfenc: use av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07 21:30:07 +02:00
Alex Converse
a8656cd425
mpegts: Remove disabled extension matching probe.
2012-06-07 12:27:04 -07:00
Michael Niedermayer
610a52647b
xmv: use av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07 21:09:06 +02:00
Michael Niedermayer
4e3fc46828
h264_mvpred: use av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07 21:07:17 +02:00
Michael Niedermayer
3422e7c395
lavc/rectangle: change assert to av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07 20:51:07 +02:00
Michael Niedermayer
107b42388c
lavf: fix missing "parser not found" message
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07 19:02:32 +02:00
Michael Niedermayer
23d8aaae46
yuv2rgb: remove assert() the codepath is not invalid
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07 18:01:09 +02:00
Michael Niedermayer
5ee638fd54
svq1enc: use av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-07 18:01:09 +02:00
Nicolas George
25e87fc5f6
ffmpeg: move keyboard interaction in a function.
...
It makes the transcode loop easier to read (30% less code)
and the differences with avconv easier to spot.
2012-06-07 17:13:02 +02:00
Nicolas George
9915a33fc2
lavfi/audio: fix size of copied samples.
...
Fixes sporadic segfaults with some filters.
2012-06-07 17:03:45 +02:00
Mans Rullgard
d0e9415d23
fate: avoid freopen(NULL) in videogen/rotozoom
...
A number of systems do not implement freopen() with a NULL filename
correctly. This changes these programs to output individual images
if opening a named output argument as a file fails, in this case
assuming it is a directory.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-06-07 11:28:39 +01:00
Marton Balint
5fdcfdf237
ffplay: fix build if avfilter is disabled
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2012-06-07 01:22:00 +02:00
Marton Balint
a78bc6f78c
ffplay: fix frame_delay calculation in new avfilter code
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2012-06-07 01:22:00 +02:00
Marton Balint
e85df18d74
ffplay: add support for changing pixel format
...
With the filtering code refactored, it was much easier to finally fix this.
Fixes ticket 123 and 238.
Signed-off-by: Marton Balint <cus@passwd.hu>
2012-06-07 01:22:00 +02:00
Marton Balint
cd947e9a2b
ffplay: add missing filt_in assignment after video filter reconfigure
...
Fixes segfaults on changing resolution.
Signed-off-by: Marton Balint <cus@passwd.hu>
2012-06-07 01:22:00 +02:00
Marton Balint
0a501c756f
ffplay: fix frame aspect ratio after qatar merge
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2012-06-07 01:22:00 +02:00
Michael Niedermayer
c9651d4bee
ffplay: fix use after free
...
reproduceable with:
ffmpeg -i tests/lena.pnm -pix_fmt pal8 -vcodec rawvideo -s 512x512 out.avi
valgrind ffplay_g out.avi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
2012-06-07 01:21:52 +02:00
Marton Balint
1372c826de
ffplay: use dummy video driver if display is disabled
...
Fixes ticket 1402.
Signed-off-by: Marton Balint <cus@passwd.hu>
2012-06-07 00:05:29 +02:00
Stefano Sabatini
8d1de449f0
ffprobe: show packet duration in frame
2012-06-06 23:26:04 +02:00
Stefano Sabatini
9083d09ebb
ffprobe: honour special value for duration
...
A duration value is undefined when is 0, take into consideration this
fact when printing optional fields.
2012-06-06 23:26:04 +02:00
Stefano Sabatini
ad347bf459
lavfi: remove avfilter_default_item_name() from public API
...
The function was introduced in 4d6a8a2bdb
and is not used anymore
outside avfilter.c.
This avoids to pollute the public API with an apparently unnecessary
function. The function was introduced a few days ago, so removing it from
the public API should do no much harm.
2012-06-06 23:25:33 +02:00
Stefano Sabatini
fe16ca1b91
lavfi/ocv: fix compilation after internalization of public functions
...
Include missing required internal headers.
2012-06-06 23:22:13 +02:00
Stefano Sabatini
ce7266c66a
tools/graph2dot: factorize code printing non-media specific link information
2012-06-06 23:20:02 +02:00
Stefano Sabatini
20689670c8
tools/graph2dot: show input and output pad names in the link label
2012-06-06 23:19:56 +02:00
Michael Niedermayer
eeba7c874b
wmv2enc: use av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-06 21:18:47 +02:00
Michael Niedermayer
c3b6efa4cb
sinewin_tablegen: use av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-06 21:18:33 +02:00
Michael Niedermayer
62eace231c
put_bits: use av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-06 21:18:14 +02:00
Michael Niedermayer
28e4f906fa
golomb: use av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-06 20:13:17 +02:00
Michael Niedermayer
6e6dd9995b
resample_template: use av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-06 20:08:57 +02:00
Michael Niedermayer
58e4adb6f7
libavutil/integer: use av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-06 20:01:08 +02:00
Michael Niedermayer
2f23a8ab17
libavutil/mathematics: use av_assert()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-06 20:00:35 +02:00
Michael Niedermayer
317ca0d3f7
mpegvideo: fix out of heap array accesses
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-06 19:26:21 +02:00
Philip Langdale
92c065f93f
ffmpeg: Set duration on encoded subtitle packets.
...
Currently, we don't set the duration on the packet of a newly
encoded subtitle. This information may be required by the
muxer.
Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-06 18:49:10 +02:00
Michael Niedermayer
33775c3507
search_for_quantizers_faac: fix curband
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-06 18:35:05 +02:00
Matthieu Bouron
f6d952f584
mxfenc: write optional field dominance flag in picture description
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-06 17:13:28 +02:00
Reimar Döffinger
93147daf59
ffmpeg: avoid a confusing and easy to break if().
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-06 17:13:28 +02:00
Carl Eugen Hoyos
bb32124577
Fix maxband limit when decoding mpc8.
...
Fixes yesterday's merge of Kostya's fix for ticket #409 .
2012-06-06 13:09:02 +02:00