virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
46,249 Commits 37 Branches 400 Tags 460 MiB
5b4cae50c9
Commit Graph

46249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
c01a462cda rmdec: fix null derefercne 
Fixes CID733714
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-26 16:18:09 +02:00
Michael Niedermayer
1bf5071104 rmdec: use av_assert for audio_pkt_cnt 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-26 16:13:16 +02:00
Michael Niedermayer
9aa630a520 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: sanitise sparc vis check
  configure: recognise more sparc variants as --cpu argument
  build: Include HEADERS-yes in the HEADERS variable
  pcm: change references to raw to pcm
  ffv1: set the range coder state in decode_slice_header
  pcmdec: change default of channels parameter to 1

Conflicts:
	libavformat/pcmdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-26 15:20:48 +02:00
Mans Rullgard
6aa93689ab configure: sanitise sparc vis check 
It is wrong to force -mcpu=ultrasparc when checking for vis.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-26 12:29:03 +01:00
Michael Kostylev
eadfb0560a configure: recognise more sparc variants as --cpu argument 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-26 12:29:03 +01:00
Paul B Mahol
7fe6f6e2b1 caf muxer: write metadata 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-26 03:12:45 +00:00
Michael Niedermayer
507f2940cc Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3' 
* commit '1b891d17c531e8a63c2974aab4bf997ce70746f3':
  avconv: fix bitrate report when writing to /dev/null
  avfilter: fix graphparser memleaks on error paths
  rawdec: remove ff_raw_read_header
  pcmdec: remove dependency from rawdec
  g722: refactor out of rawdec.c
  rawvideo: use a specific read_header

Conflicts:
	ffmpeg.c
	libavformat/Makefile
	libavformat/rawdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-26 14:24:57 +02:00
Michael Niedermayer
9f36ec6aa9 aacps: fix order of operands of ipdopd_reset(). 
With the current implementation this is purely cosmetic

Fixes CID732285
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-26 03:24:13 +02:00
Michael Niedermayer
0018aa9013 aacps: loose self assignment 
Fixes CID604123
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-26 03:24:13 +02:00
Michael Niedermayer
f69f9b3876 aacenc: replace scale factor warning by assert 
The code would crash after printing the warning

Fixes CID717903, CID717904
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-26 03:24:13 +02:00
Matthieu Bouron
cfb1c3c9f0 aiffdec: read ID3 attached pictures 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-26 01:52:40 +02:00
Paul B Mahol
73f9d2e887 cafenc: make .long_name match demuxer 
While here reindent .codec_tag .

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-25 23:04:13 +00:00
Stefano Sabatini
15f52e50fe tools: add ffescape utility 2012-10-25 23:56:16 +02:00
Paul B Mahol
04a585f054 fraps: use meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-25 21:51:45 +00:00
Paul B Mahol
43f662d9bf lvfdec: cosmetics: fix identation 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-25 20:57:40 +00:00
Clément Bœsch
13d26716fb lavfi/showspectrum: add sliding mode. 2012-10-25 22:20:22 +02:00
Stefano Sabatini
b19bfd6c9f lavd/lavfi: fix leak in case of failure 
Jump to the common release code in case of failure.
 2012-10-25 21:35:40 +02:00
Nicolas George
48ec8b25a7 lavfi/af_volumedetect: print stats in uninit(). 
If the stats are printed when request_frame on the input
returns EOF, then they are never printed if the filter is
not flushed, in particular when using the -t ffmpeg option.

Fix trac ticket #1727.
 2012-10-25 20:16:09 +02:00
Alexis Ballier
ce028ab9a7 Restore installation of libavutil/lzo.h after 2a91ada828 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-25 20:00:19 +02:00
Nicolas George
77a72d3485 lavfi/vf_fps: allow to set the rounding method. 
By default, fps selects frames near PTS 0, 0.5, 1.5, 2.5, etc.
With round=down, it selects the frames near PTS 0, 1, 2, 3, etc.
 2012-10-25 19:42:44 +02:00
Martin Ettl
cc72d52dc1 ffserver: fix printf argument type 2012-10-25 16:35:57 +00:00
Martin Storsjö
121604b024 build: Include HEADERS-yes in the HEADERS variable 
This makes sure the previously always installed public header
lzo.h is installed if the LZO functionality is enabled.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-25 18:36:11 +03:00
Luca Barbato
254056c4ab pcm: change references to raw to pcm 2012-10-25 17:08:58 +02:00
Paul B Mahol
d8245c3bcd dsicinav: return proper error code in case of malloc failure 
Fixes null pointer dereference.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-25 13:46:19 +00:00
Paul B Mahol
296f9c2b3b dsicinav: return meaningful error code 
While here remove redundant references in error message.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-25 13:10:23 +00:00
Janne Grunau
1b891d17c5 avconv: fix bitrate report when writing to /dev/null 
avio_size() reports the filesize which returns 0 for /dev/null.
avio_tell() reports the current position.

Also handle errors from avio_tell().
 2012-10-25 15:00:15 +02:00
Janne Grunau
285b706b55 avfilter: fix graphparser memleaks on error paths 
Fixes CID700635, CID700636 and CID732274.
 2012-10-25 15:00:15 +02:00
Luca Barbato
587874ef1c rawdec: remove ff_raw_read_header 
It is not used anymore and is a kludge.
 2012-10-25 14:05:13 +02:00
Luca Barbato
2ef4d586d6 pcmdec: remove dependency from rawdec 
The code shared is not actually shared with anything else.
 2012-10-25 14:05:13 +02:00
Luca Barbato
5f0e161dd6 g722: refactor out of rawdec.c 2012-10-25 14:05:05 +02:00
Luca Barbato
42c26a4864 rawvideo: use a specific read_header 
ff_raw_read_header is used only for this demuxer for video.
 2012-10-25 14:04:18 +02:00
Tomas Härdin
5c108092a3 mxfenc: Write MultipleDescriptor ref in Preface 
Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-25 13:56:24 +02:00
Michael Niedermayer
da4e4d65f4 aacdec: reorder multiuplications to make code safer against too large input values. 
Fixes CID700697
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-25 13:45:26 +02:00
Michael Niedermayer
aa604e8e33 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avutil: Make LZO decoder code configure-time selectable
  avutil: Move memcpy_backptr() to mem.c
  configure: detect parisc64 automatically
  configure: detect ppc64 automatically
  configure: detect mips64 automatically
  configure: generalise 64-bit test
  smoothstreamingenc: Don't assume streams start from timestamp 0

Conflicts:
	configure
	libavutil/Makefile
	libavutil/lzo.c
	libavutil/lzo.h
	libavutil/mem.c
	libavutil/mem.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-25 13:15:58 +02:00
Diego Biurrun
2a91ada828 avutil: Make LZO decoder code configure-time selectable 2012-10-25 11:49:49 +02:00
Diego Biurrun
5bac2d0c30 avutil: Move memcpy_backptr() to mem.c 
The function is used elsewhere and does not belong with the LZO code.
 2012-10-25 11:36:57 +02:00
Michael Niedermayer
d312ffdd79 mpegvideo: fix lowres on field pictures 
Fixes Ticket1846

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-25 04:03:58 +02:00
Michael Niedermayer
1a535fc477 fate: reenable some recently lost audio tests 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-25 03:13:32 +02:00
Michael Niedermayer
fa48da1ee9 ffmpeg: fix null ptr deref in psnr printing code 
Fixes CID205005
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-25 01:38:15 +02:00
Michael Niedermayer
a1af505d66 roqaudioenc: remove dead code 
Fixes CID703669
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-25 01:38:15 +02:00
Michael Niedermayer
4a2297294f qt-faststart: check return of ftello() 
Fixes CID739863
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-25 01:32:45 +02:00
Michael Niedermayer
ed68085104 asfdec: fixed signedness in comparission 
Fixes CID739864
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-25 00:35:55 +02:00
Michael Niedermayer
0008e0d632 cmdutils: fix unclosed file on error 
Fixes CID739865
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-25 00:32:34 +02:00
Michael Niedermayer
58c2c17f1d mov_probe: use correct variable 
Fixes CID739867
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-25 00:24:25 +02:00
Michael Niedermayer
aa47821344 cmdutils: remove writes in never read variable 
Fixes CID739868
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-25 00:24:25 +02:00
Clément Bœsch
2ecf9492ff lavf/srtenc: set codec to subrip by default. 
We don't have a text encoder yet, so this commit makes automatic
encoding working with srt output.
 2012-10-25 00:17:56 +02:00
Clément Bœsch
fd090a5d09 lavf/srtenc: simplify timing printing. 2012-10-25 00:17:46 +02:00
Clément Bœsch
c27b3816e4 srt: make the demuxer output SubRip packets. 
The SRT format should never have outputted CODEC_ID_SRT packets in the
first place: SRT is a subtitle format containing SubRip text markup
events. The timing information is part of the format, not the codec, and
thus CODEC_ID_SRT should not exist.

Creating packets with the timing information within the payload only
leads to problem (such as remuxing with timing alteration not working),
especially when the SubRip markup is being used in container like
Matroska in addition to this standalone SRT format.

The main reason the timing line was included in those CODEC_ID_SRT
packets is likely because it contained extra information (the event
position) the codec actually needs. This issue is solved by using the
AV_PKT_DATA_SUBTITLE_POSITION side data type.
 2012-10-25 00:09:36 +02:00
Clément Bœsch
4d46fd0b3e lavc: add AV_PKT_DATA_SUBTITLE_POSITION side data type. 
This commit introduces a new packet side data type for the subtitle
position information. This is meant to be used by the SRT format where
that information is stored along with the timing, which is not part of
the subrip packets.
 2012-10-24 23:58:18 +02:00
Clément Bœsch
60d9ee1b75 lavc/utils: make sub decode consistent with A/V. 
This allows side data to be transmitted properly with subtitles.
 2012-10-24 23:56:43 +02:00