ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-02 19:20:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
68,223 Commits 37 Branches 400 Tags 503 MiB
81f116d31c
Commit Graph

68223 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
81f116d31c Merge commit 'e0bb74a1403ed77ef369b9d62866f8a4afaf3f1d' 
* commit 'e0bb74a1403ed77ef369b9d62866f8a4afaf3f1d':
  exr: Add a gamma flag to exr loader to avoid banding

Conflicts:
	libavcodec/exr.c

See: cd3daad77e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-05 21:58:33 +01:00
Michael Niedermayer
47c066f22e Merge commit 'd69d787dad77f62c89cbc7ea5d301641f45f36e3' 
* commit 'd69d787dad77f62c89cbc7ea5d301641f45f36e3':
  h264: proper cleanup in ff_h264_alloc_tables() if DPB alloc fails

See: 949057c958
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-05 21:43:24 +01:00
Michael Niedermayer
7a64f16841 Merge commit '56de2897a68e3a8795b0b3c593dad1c5832696e0' 
* commit '56de2897a68e3a8795b0b3c593dad1c5832696e0':
  h264: Fix memory leak on ff_h264_decode_init() failure

Conflicts:
	libavcodec/h264.c

See: 309a931a38
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-05 21:41:01 +01:00
Michael Niedermayer
4ba0141921 avcodec/dvbsubdec: Pass context to av_log() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-05 20:33:57 +01:00
Michael Niedermayer
b0ae362a21 avcodec/golomb: use NULL for pointers instead of 0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-05 20:27:04 +01:00
Piotr Fusik
c99e5191ab doc/examples/filtering_video: fix frame rate 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-05 16:52:19 +01:00
Rafaël Carré
57bfafe76b avformat/mpegts: fix Opus stream count 
That number represents the number of streams, not the number of channels

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-05 16:00:11 +01:00
Michael Niedermayer
a7ebd0b011 avcodec/mpegaudiodec_template: only allocate fdsp when its used 
Fixes memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-05 04:27:49 +01:00
Lukasz Marek
4a0b1d9245 lavc/libxvid: workaround for bug in libxvidcore 
libxvidcore calculate number of threads basing on video height.
If height is small enough it allocates 0 bytes long memory and
writes to it.
Setting thread_count to 0 uses 1 thread and skips bugged code.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-05 03:29:28 +01:00
Mark Reid
4f69477870 libavformat/mxfdec.c refactor resolving MultiDescriptor and remove essence group hack 
I think this is a better way to deal with single frame essence data then my
previous way.

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 23:31:37 +01:00
Steve Jiekak
a32c3c2392 replaced av_dv_codec_profile by av_dv_codec_profile2 in encoder and dv muxers 
Signed-off-by: Steve Jiekak <devaureshy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 20:24:00 +01:00
Steve Jiekak
6e9ac02af8 add av_dv_codec_profile2 : uses framerate to select best matching profile. default on first matching profile 
Signed-off-by: Steve Jiekak <devaureshy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 20:23:52 +01:00
Michael Niedermayer
bde27e1e61 doc/examples/transcoding: check encoder before using it 
Fixes null pointer exception

Found-by: stoupeace
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 18:58:38 +01:00
Michael Niedermayer
cbf09545f2 avcodec/imc: only check remaining bits in case bits will be read 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 18:24:50 +01:00
Christophe Gisquet
291747581e imc: make issue non-fatal 
The "faulty" samples actually sound fine when ignoring this issue.

For ticket #3886, more samples are decoded.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 18:24:33 +01:00
Benoit Fouet
0f6931f4b6 avcodec/pngdec: use memcpy instead of byte loops for P frames. 
Rely on the way memcpy is optimized for one's system instead of looping
on a byte buffer for buffer copies to handle P frames.

Tested-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 17:01:04 +01:00
Michael Niedermayer
a4f21a8dd9 MAINTAINERS: add 2.5 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 14:24:59 +01:00
Rong Yan
d23e883248 avcodec/ppc/vp8dsp_altivec.c: POWER LE support put_vp8_epel_h_altivec_core() put_vp8_epel_v_altivec_core() put_vp8_pixels16_altivec() add marcos GET_PIXHL() GET_OUTER() LOAD_HL() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 13:35:06 +01:00
Rong Yan
36cd2bcbc3 avcodec/ppc/vc1dsp_altivec: add POWER LE support to vc1_inv_trans_8x4_altivec() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 11:47:23 +01:00
Timothy Gu
af14ae8037 RELEASE: Bump 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 11:44:35 +01:00
Michael Niedermayer
5fe026f2bd avcodec/aacdec: reduce noisiness of missing channel elements 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 01:52:32 +01:00
Michael Niedermayer
8d87c0b3ad Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Fix standalone compilation of the iec61883 input device.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 01:52:01 +01:00
Carl Eugen Hoyos
963aa1daf8 Fix standalone compilation of the iec61883 input device. 2014-12-04 01:35:47 +01:00
Michael Niedermayer
0f16ab18db doc/APIchanges: add 2.5 cut marker 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 01:28:40 +01:00
Michael Niedermayer
f478bdabf2 Changelog: add 2.5 entry 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 01:28:06 +01:00
Benoit Fouet
1d69ab9d1c avcodec/pngdec: fix indentation in handle_row() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 00:31:11 +01:00
Benoit Fouet
6e9b060e4f avcodec/pngdec: fix mem leak in init() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 00:30:54 +01:00
Benoit Fouet
08aec6f68e libavcodec/pngdec: support 'previous' dispose operation for APNG. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-04 00:30:38 +01:00
Reimar Döffinger
49d9cbe55d h264_i386: Fix operand size 
Fixes fate failure on macosx clang x86-64

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-03 23:03:13 +01:00
Michael Niedermayer
dac9e50902 RELEASE_NOTES: update for 2.5 
If you spot something missing wrong or improvable, do not hesitate
to push fixes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-03 22:40:02 +01:00
Michael Niedermayer
43520771f1 doc/APIchanges: fill in hashes and dates 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-03 22:40:02 +01:00
Michael Niedermayer
1027a44681 Changelog: Add libpostproc visualization 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-03 22:40:02 +01:00
Lukasz Marek
650aa36f35 lavf/oggenc: use meaningful error codes 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-12-03 22:20:22 +01:00
Michael Niedermayer
8524558858 swscale/x86/rgb2rgb_template: fix crash with tiny size and nv12 output 
Fixes Ticket4151

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-03 20:21:56 +01:00
Michael Niedermayer
a6f730730b avformat/rmdec: Check codec_data_size 
Fixes infinite loop
Fixes Ticket4154

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-03 20:01:18 +01:00
Michael Niedermayer
eac5c7b837 avformat/aviobuf: Fix infinite loop in ff_get_line() 
Fixes ticket4152

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-03 19:05:56 +01:00
Jonathan Baecker
868cec5874 avdevice/decklink_common: fix COM initialization failure check 
Signed-off-by: Jonathan Baecker <jonbae77@gmail.com>
Reviewed-by: Ramiro Polla <ramiro.polla@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-03 18:47:24 +01:00
Michael Niedermayer
534f901fca avcodec/atrac3plusdec: Use avpriv_float_dsp_alloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-03 14:52:38 +01:00
Michael Niedermayer
c5dc8cc03a avcodec/mpegaudiodec_float: Use avpriv_float_dsp_alloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-03 14:52:38 +01:00
Michael Niedermayer
e316caf712 avcodec/opusdec: Use avpriv_float_dsp_alloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-03 14:52:38 +01:00
Christophe Gisquet
9fa056ba75 pngdsp x86: use unaligned access 
For test images manually generated to contain only up prediction,
timing results:
         8380x3032    255x185
before:   138635       1992
after:    139232       1996

Actually jumping to the proper version depending on the alignment:
8380x3032: 138767

A 0.5% speed improvement for gigantic images is not worth the code
duplication.

Fixes ticket #4148

Signed-off-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Tested-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-03 11:56:22 +01:00
Gonzalo Garramuno
e0bb74a140 exr: Add a gamma flag to exr loader to avoid banding 
This is needed to avoid banding artifacts when gammaing the picture.
Currently, if done with a video filter, the process is done on uints
instead of full float.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-12-03 02:55:40 +00:00
Michael Niedermayer
d69d787dad h264: proper cleanup in ff_h264_alloc_tables() if DPB alloc fails 
CC: libav-devel@libav.org
 2014-12-03 02:51:27 +00:00
Dale Curtis
56de2897a6 h264: Fix memory leak on ff_h264_decode_init() failure 
CC: libav-devel@libav.org
 2014-12-03 02:51:18 +00:00
Michael Niedermayer
242f1152bf ffmpeg: drop usage of coded_frame 
It causes all kinds of problems and there is no code in the muxers that reads
this field

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-03 03:06:43 +01:00
Jonathan Baecker
5a57f389f4 avdevice/decklink_common: fix heap corruption run time error 
Signed-off-by: Jonathan Baecker <jonbae77@gmail.com>
Reviewed-by: Ramiro Polla <ramiro.polla@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-03 00:41:10 +01:00
Carl Eugen Hoyos
7a4be4315f Support muxing 4k AVC Intra in mov. 
Reported and tested by Rens Dijkshoorn, rens onlinemedia nl
 2014-12-02 23:35:40 +01:00
Michael Niedermayer
ebc29e8625 Merge commit '2e0935965b824bc641b7e0bafafcbb1e36027f79' 
* commit '2e0935965b824bc641b7e0bafafcbb1e36027f79':
  Drop the unofficial extension prefix for MPEG and MPEG-TS formats

See: fdcb2873e1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-02 22:56:07 +01:00
Michael Niedermayer
b329460c51 Merge commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee' 
* commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee':
  mpegtsenc: recognize .mts as MPEG Transport Stream

Conflicts:
	libavformat/mpegtsenc.c

See: e2baaa21aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-02 22:53:22 +01:00
Michael Niedermayer
d76adfae9c Merge commit '8f8caca2242e1fe05f37493cfabcd3f4de198550' 
* commit '8f8caca2242e1fe05f37493cfabcd3f4de198550':
  Add support for BDAV/m2ts-mode muxing

Conflicts:
	libavformat/mpegtsenc.c

See: 09a858da7d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-02 22:42:35 +01:00