RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
41,418 Commits 36 Branches 392 Tags 306 MiB
Commit Graph

41418 Commits

Author SHA1 Message Date
Michael Niedermayer dfde3d497e swr: add inrermediate sample type for rematrixing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-08 21:54:54 +02:00
Michael Niedermayer 718607be28 rv10: change assert() to av_assert() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-08 18:24:47 +02:00
Mike Scheutzow 1be7bfdd2b ffmpeg.c: fix erroneous "Output file is empty" message. 
This message is printed whenever the RAWVIDEO codec is used, whether the
output file contains any frames or not. Test command:
./ffmpeg -i infile.y4m outfile.y4m

Signed-off-by: Mike Scheutzow <mjs973@optonline.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-08 18:22:40 +02:00
Paul B Mahol 134d0f7119 Revert "Fix building libopencore_amrnb decoder without libopencore_amrnb encoder" 
Reverting "Fix" because it disables amrwb decoder.

This reverts commit e11020a145.
 2012-06-08 13:55:30 +00:00
Carl Eugen Hoyos b35d38bd04 Add iac build dependency. 
Found and analysed by trac user Jamal.

Fixes the remaining part of ticket #1428.
 2012-06-08 15:29:24 +02:00
Carl Eugen Hoyos 37a9cdfc2c Fix dirac decoder build dependencies. 
Found, analysed and tested by trac user Jamal.

Fixes part of ticket #1428.
 2012-06-08 15:29:24 +02:00
Carl Eugen Hoyos 8a880d6918 Fix latm muxer Makefile dependencies. 
Found, analysed and tested by trac user Jamal.

Fixes part of ticket #1428.
 2012-06-08 15:29:23 +02:00
Carl Eugen Hoyos b8e2dcd266 Fix jacosub muxer Makefile dependencies. 
Found, analysed and tested by trac user Jamal.

Fixes part of ticket #1428.
 2012-06-08 15:29:23 +02:00
Carl Eugen Hoyos b8fe9f08be Fix amv encoder dependencies. 
Found, analysed and tested by trac user Jamal.

Fixes part of ticket #1428.
 2012-06-08 15:29:23 +02:00
Paul B Mahol e11020a145 Fix building libopencore_amrnb decoder without libopencore_amrnb encoder 
Fixes #1210.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-08 13:03:10 +00:00
Paul B Mahol f4e0ec814b pixdesc: BGRA64 is rgb pixel format 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-08 10:42:27 +00:00
Michael Niedermayer 5b51efdc3a fate-bprint: try to workaround platform specific value. 
this should fix some fate failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-08 12:16:31 +02:00
Michael Niedermayer d5d30d56ed Revert "sinewin_tablegen: use av_assert" 
using as_assert() in the table generator would make the generators
have to be linked to libavutil.

This reverts commit c3b6efa4cb.
 2012-06-08 11:44:50 +02:00
Michael Niedermayer 80485a4f9a mpegtsenc: make pts/dts offseting optional 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-08 03:35:15 +02:00
Nicolas George 6668ef7567 cmdutils: include threading caps in codecs listing. 
Suggested by Roger Pack on ffmpeg-user.
 2012-06-07 23:19:20 +02:00
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