ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-21 22:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,457 Commits 36 Branches 398 Tags 535 MiB
14e240cb4a
Commit Graph

50457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clément Bœsch
14e240cb4a lavfi/opencv: isgraph -> av_isgraph. 
Fix build after 88d55b8.
 2013-03-03 22:06:48 +01:00
Reimar Döffinger
88d55b827d Remove incorrect use of ctype.h functions. 
As far as I can tell the code should not change behaviour
depending on locale in any of these places.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-03-03 21:44:10 +01:00
Ronald S. Bultje
2cffe38df3 Deprecate deinterlaced in libavcodec. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 21:11:48 +01:00
Michael Niedermayer
9af8179cdb ffmpeg: fix -stats -v 0 
Fixes Ticket1687

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 19:38:13 +01:00
Michael Niedermayer
f2cb993139 avformat: gather aspect ratio from rv30/40 in find_stream_info 
Fixes Ticket1550

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 18:41:16 +01:00
Michael Niedermayer
d210e9741e rv34: fix aspect ratio 
Fixes part of Ticket1550

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 18:40:57 +01:00
Michael Niedermayer
6c6dc8ccea wmadec: check nb_frames 
Improves error message for Ticket968

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 16:50:47 +01:00
Michael Niedermayer
3fac99cd9d Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  movenc: Do not flag secondary audio and subtitle tracks as enabled.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 14:05:09 +01:00
Ronald S. Bultje
d98aa7cdc1 h264: put call to ff_print_debug_info2 under CONFIG_MPEGVIDEO. 
The code is located in mpegvideo, and it's likely that in a minimal
config, we don't want to include debug info anyway.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 12:19:29 +01:00
Ronald S. Bultje
d4e649cca6 h264: make it possible to compile without error_resilience. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 12:19:15 +01:00
Michael Niedermayer
981cf0c300 movenc: Do not flag secondary audio and subtitle tracks as enabled. 
Fixes ticket #468 and ticket #1174.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2013-03-03 12:09:38 +01:00
Michael Niedermayer
fd464d4d01 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtpdec: Initialize some variables to silence compiler warnings

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 11:40:37 +01:00
Ronald S. Bultje
454c5d10b2 h264: add a copy of draw_horiz_band. 
This makes the decoder independent of mpegvideo.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 00:45:45 +01:00
Michael Niedermayer
4f0d4acc70 libxvid: cleanup on error pathes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-02 20:39:38 +01:00
Michael Niedermayer
667bf15652 libxvid: check & clear encoder_handle 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-02 20:32:21 +01:00
Michael Niedermayer
8fe59240a1 libxvid: use av_freep() for saftey 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-02 20:31:07 +01:00
Michael Niedermayer
6a8f6c773d libxvid: remove temporary files at the end 
Fixes Ticket924

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-02 20:30:28 +01:00
Martin Storsjö
8fbab7a6c8 rtpdec: Initialize some variables to silence compiler warnings 
The warnings are false positives, older gcc versions (such as 4.5)
think the variables can be used uninitialized while they in
practice can't, while newer (4.6) gets it right.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-02 21:23:52 +02:00
Michael Niedermayer
03bc7a004e mjpegdec: fix endiansoup 
Fixes Ticket2175

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-02 19:12:06 +01:00
Carl Eugen Hoyos
6091a8d92d Avoid huge memory allocations from asf demuxer. 
Fixes ticket #1888.
 2013-03-02 18:37:55 +01:00
James Almer
1d5b35cc07 lavc/flacdec: Add frame CRC calculation 
Fixes ticket #2266

Signed-off-by: James Almer <jamrial@gmail.com>
 2013-03-02 17:22:18 +00:00
Michael Niedermayer
4ae74c6312 ffmpeg: print maxrss "-benchmark" data even on errors 
Fixes Ticket2297

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-02 16:04:49 +01:00
Michael Niedermayer
5167bb2e8e er: Fix slice threading check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-02 14:28:20 +01:00
Michael Niedermayer
547042a8cd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h264: set ref_count to 0 for intra slices.

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-02 12:10:52 +01:00
Michael Niedermayer
2d2e6db7cf Merge commit '668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8' 
* commit '668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8':
  h264: on reference overflow, reset the reference count to 0, not 1.

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-02 11:53:19 +01:00
Michael Niedermayer
ec203cd69b Merge commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9' 
* commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9':
  h264: do not copy ref count/ref2frm when updating per-frame context
  flvdec: Check the return value of a malloc

Conflicts:
	libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-02 11:41:31 +01:00
Michael Niedermayer
973dc110ba Merge commit 'c91c63b5380bf79655c09320774a022f84d76fd5' 
* commit 'c91c63b5380bf79655c09320774a022f84d76fd5':
  flvdec: Don't read the VP6 header byte when setting codec type based on metadata

Conflicts:
	libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-02 11:27:58 +01:00
Anton Khirnov
437211ae73 h264: set ref_count to 0 for intra slices. 
CC:libav-stable@libav.org
 2013-03-02 10:27:13 +01:00
Anton Khirnov
668e16a0dd h264: on reference overflow, reset the reference count to 0, not 1. 
Since decode_slice_header() returns before the reference lists are
constructed, there are zero valid references.

CC:libav-stable@libav.org
 2013-03-02 10:27:03 +01:00
Anton Khirnov
e671d3ad6c h264: do not copy ref count/ref2frm when updating per-frame context 
They are filled in decode_slice_header() anyway.
 2013-03-02 10:26:50 +01:00
Michael Niedermayer
3827734591 v4l2: fix regression that caused ffmpeg to occasionally get stuck 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-02 01:55:08 +01:00
Giorgio Vazzana
0d66268e15 lavd/v4l2: copy frames into normally allocated packets whenever there is just one buffer left available 
This will avoid the possibility that we dequeue more buffers than we
have obtained from the v4l2 driver.

Fixes ticket #1570

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-02 00:50:17 +01:00
Martin Storsjö
c5a738ca4e flvdec: Check the return value of a malloc 
The callers of this function can't report errors sanely. If this
one malloc fails, don't write the extradata byte, make sure we
try to malloc it the next time we're called instead, and make sure
we still consume the input data byte.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-02 00:39:37 +02:00
Martin Storsjö
c91c63b538 flvdec: Don't read the VP6 header byte when setting codec type based on metadata 
This header byte is only present when actually reading a VP6 frame,
not when reading the codec type field in the metadata. This
potential bug has been present since 5b54a90c.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-02 00:39:36 +02:00
Michael Niedermayer
ec1d2e2fb0 ffplay: use AVFrame accessor functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 23:22:08 +01:00
Michael Niedermayer
cc38ca6748 avcodec/utils: use AVFrame accessor functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 23:18:23 +01:00
Michael Niedermayer
30806ddcbc avcodec/rawdec: use AVFrame accessor functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 23:18:22 +01:00
Michael Niedermayer
f59ff8faa2 pngdec: use AVFrame accessor functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 23:18:22 +01:00
Michael Niedermayer
ff080346c6 gifdec: use AVFrame accessor functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 23:18:22 +01:00
Michael Niedermayer
7d7fb70129 cpia: use AVFrame accessor functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 23:18:22 +01:00
Michael Niedermayer
f232659130 tiff: use AVFrame accessor functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 23:18:22 +01:00
Michael Niedermayer
e0f716a9d9 ac3dec: use AVFrame accessor functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 23:18:22 +01:00
Michael Niedermayer
3ded235f59 ffprobe: use AVFrame accessor functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 23:18:22 +01:00
Michael Niedermayer
5ade6bfb03 doc/examples/demuxing: use AVFrame accessor functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 22:40:50 +01:00
Michael Niedermayer
bf90ef0314 avcodec: add ff_frame_get_metadatap() 
This is needed for av_dict_*

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 22:40:50 +01:00
Paul B Mahol
5b802cf567 lavc/codec_desc: add/fix .props for SGI/DPX/X-face/BRender PIX image 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-01 15:22:02 +00:00
Joseph Artsimovich
4a6bd34637 Handle an invalid extra mpeg2 picture header following a frame-encoded picture. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 16:04:31 +01:00
Paul B Mahol
6c7d1608dd sgidec: use unchecked bytestream2 functions where it makes sense 
Overreads can not happen as header size of 512 bytes is required.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-01 14:59:33 +00:00
Rob Sykes
dc666d360b soxr: libsoxr 0.1.1 support 
Libsoxr 0.1.1 will be out very soon; no changes planned beyond what's currently in git.
It includes a couple of fixes (not affecting FFmpeg's current usage) and a minor API change (but remains ABI compatible).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 14:38:02 +01:00
Paul B Mahol
5a232e5078 exr: use bytestream functions in pxr24_uncompress() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-01 13:16:29 +00:00