ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 05:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,490 Commits 36 Branches 398 Tags 535 MiB
aba18c5af9
Commit Graph

23021 Commits

Author SHA1 Message Date
Alexander Kojevnikov
29d8cd265a mp3dec: Fix VBR bit rate parsing 
When parsing the Xing/Info tag, don't set the bit rate if it's an Info tag.

When parsing the stream, don't override the bit rate if it's already set,
otherwise calculate the mean bit rate from parsed frames. This way, the bit
rate will be set correctly both for CBR and VBR streams.

Signed-off-by: Alexander Kojevnikov <alexander@kojevnikov.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-05 13:06:01 +01:00
Paul B Mahol
d7f9f34dc6 zmbv: stop doing colorspace conversion 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-05 10:27:09 +00:00
Michael Niedermayer
e398990eb8 msrledec: fix output_end checks 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-05 03:29:04 +01:00
Michael Niedermayer
dae38a66eb dnxhddec: return the correct number of bytes from decode_frame 
Fixes Ticket2022

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-04 18:17:47 +01:00
Michael Niedermayer
144da7eeca Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  buildsys: only include log2_tab per library for shared builds
  Add h264chroma dependency for cavs decoder to configure.
  Add h264qpel dependency for snow codec to configure.
  Add h264chroma dependency for vp5 and vp6 decoder to configure.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-04 14:45:52 +01:00
Michael Niedermayer
03148fd174 buildsys: only include log2_tab per library for shared builds 
Fix linking failures with -all_load due to multiple log2_tabs

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2013-03-04 12:25:02 +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
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
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
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
Michael Niedermayer
03bc7a004e mjpegdec: fix endiansoup 
Fixes Ticket2175

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-02 19:12:06 +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
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
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
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
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
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
Michael Niedermayer
1a7166a58d Merge commit 'e8c52271c45ec27d783e74238dcfad0c2008731c' 
* commit 'e8c52271c45ec27d783e74238dcfad0c2008731c':
  Revert "Move H264/QPEL specific asm from dsputil.asm to h264_qpel_*.asm."

Conflicts:
	libavcodec/x86/dsputil.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 13:39:47 +01:00
Michael Niedermayer
76f8d3c8d9 Merge commit '9d4da474f5f40b019cb4cb931c8499deee586174' 
* commit '9d4da474f5f40b019cb4cb931c8499deee586174':
  lls: move to the private namespace

Conflicts:
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 13:19:00 +01:00
Michael Niedermayer
1d178710b4 libvpxenc: dont redundantly zero fields, the whole context is zeroed on init 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 00:11:53 +01:00
Pascal Massimino
3c3a8c1489 libvpxenc: add psnr support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-28 23:29:53 +01:00
Diego Biurrun
e8c52271c4 Revert "Move H264/QPEL specific asm from dsputil.asm to h264_qpel_*.asm." 
This reverts commit f90ff772e7.

The code should be put back in h264_qpel_8bit.asm, but unfortunately
it is unconditionally used from dsputil_mmx.c since 71155d7.
 2013-02-28 21:50:02 +01:00
Paul B Mahol
33240dfa9a exr: pxr24 decompression 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-28 18:38:15 +00:00
Paul B Mahol
9f3c90a366 exr: fix error message when pixel type is not set 
This only happens with missing chlist attribute from header.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-28 18:38:15 +00:00
Paul B Mahol
4751c6c270 exr: s/bits_per_color_id/pixel_type 
Previous naming was misleading.

Also fix wrong message about missing
support for 32-bit unsigned int pixel type.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-28 18:38:15 +00:00
Paul B Mahol
a71926a548 exr: track channels properties 
Needed for proper decoding of channels with subsampling
and also for remaining compression methods.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-28 18:38:14 +00:00
Nicolas George
bf63a474ca lavc/exr: use size_t instead of int for sizes. 
Fix a segfault on 64-bits archs.
 2013-02-28 19:13:58 +01:00
Michael Niedermayer
c4735eef03 loco: silence warning: decoded may be used uninitialized in this function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-28 18:10:49 +01:00
Luca Barbato
9d4da474f5 lls: move to the private namespace 
The functions are private.
 2013-02-28 17:39:24 +01:00