ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-23 23:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,824 Commits 36 Branches 398 Tags 538 MiB
ebb8dd437b
Commit Graph

56824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
ebb8dd437b mov: fix trun / pseudo_stream_id handling 
This fixes simple concatenated h264

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-02 19:59:10 +02:00
Michael Niedermayer
95666b2298 avcodec/imgconvert/get_color_type: fix type for PAL8 
Fixes Ticket3008

Fate changes as PAL8 gets used instead of BGR8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-02 19:59:10 +02:00
Paul B Mahol
2490996f38 avcodec: use designated initializers for bitstream filters 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-02 17:20:29 +00:00
Michael Niedermayer
5e253fdfc1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtmp: alias rtmp_listen to listen

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-02 14:59:42 +02:00
Michael Niedermayer
c28bca2bde Merge commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1' 
* commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1':
  mxf: Remove a typo

Conflicts:
	libavformat/mxfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-02 14:55:18 +02:00
Michael Niedermayer
8aa6ffd8fa Merge commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad' 
* commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad':
  asfdec: Check the return value of asf_read_stream_properties

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-02 14:53:00 +02:00
Clément Bœsch
3841e4510b avfilter/avf_showspectrum: use the name 's' for the pointer to the private context 2013-10-02 11:37:53 +00:00
Paul B Mahol
848a1e6738 avfilter/af_afade: use the name 's' for the pointer to the private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-02 11:37:52 +00:00
Michael Niedermayer
0425fd7eb2 ffmpeg: dont return reserved values 
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-02 12:59:39 +02:00
Clément Bœsch
e31a239fea avfilter/vf_removelogo: use the name 's' for the pointer to the private context 2013-10-02 10:54:11 +00:00
Paul B Mahol
7d0ce1e59d avfilter/af_silencedetect: use the name 's' for the pointer to the private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-02 10:28:28 +00:00
Maxim Poliakovski
d49f3fa579 atrac3: Generalize gain compensation code 
Move it to the ATRAC common code, so it can be reused
in the umpcoming ATRAC3+ decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-02 10:44:02 +02:00
Maxim Poliakovski
4fa2484067 atrac3/decode_gain_control: cosmetics 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-02 10:42:12 +02:00
Maxim Poliakovski
4978be2bc6 atrac3: rename num_gain_data to num_points 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-02 10:37:38 +02:00
Maxim Poliakovski
dc80e250fc atrac3: Rename GainInfo to AtracGainInfo 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-02 10:37:05 +02:00
Maxim Poliakovski
746cb9bc53 atrac: limit line length to 80 chars 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-02 10:21:35 +02:00
Maxim Poliakovski
3d80ab015f atrac: Move doxygen comments to the header 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-02 10:21:14 +02:00
Maxim Poliakovski
cc2330fe3a atrac: Update copyright info and file description. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-02 10:19:22 +02:00
Maxim Poliakovski
852241561d atrac: Add missing av_cold. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-02 10:17:50 +02:00
Michael Niedermayer
286beebdc3 avcodec/wmalosslessdec: check block_align 
Code copied from wmaprodec

Fixes null pointer dereference
Fixes Ticket3002

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-02 01:24:19 +02:00
Michael Niedermayer
ad8fbddb94 Revert "Merge commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7'" (configure: Properly set zlib dependencies for all components) 
The reverted commit introduced undefined behavior.
undefined in the sense that the evaluation order of the dependencies affects the results

Fixes Ticket2920

This reverts commit c32db6adab, reversing
changes made to 05f1b4e2ec.

Alternative solutions would be to change the dependency solver to handle non trivial
dependencies or to enable zlib by default before the dependency solver, this would
leave a zlib dependency in the libs though then even when no zlib is needed or used.
 2013-10-01 23:52:20 +02:00
Paul B Mahol
edadda968c avfilter/vf_histogram: change order of histograms for planar rgb 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-01 21:22:22 +00:00
Marton Balint
cac9af68a4 avfilter/vf_histogram: add support for subsampled planar yuv modes in waveform mode 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-10-01 21:04:31 +00:00
Marton Balint
31a8461d64 avfilter/vf_histogram: improve waveform speed 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-10-01 21:04:30 +00:00
Michael Niedermayer
795eaf8d69 avcodec/fraps: increase vlc nb_bits 
This should fix decoding the file in:
http://ffmpeg.gusari.org/viewtopic.php?f=16&t=1078
No i dont have the file so i cant test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-01 20:37:14 +02:00
Thilo Borgmann
d3a03d90a3 configure: fix logic for threads in case of OpenCL is enabled. Fixes ticket 3004. 
Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-01 18:31:21 +02:00
Luca Barbato
628a17d78a rtmp: alias rtmp_listen to listen 
Make it uniform with the other protocols.
 2013-10-01 15:42:06 +02:00
Luca Barbato
ad0560fe74 mxf: Remove a typo 
Introduced in 93370d1216
 2013-10-01 13:43:48 +02:00
Michael Niedermayer
2e2a2d8801 swscale/utils: dont divide by zero with zero vectors 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-01 00:27:28 +02:00
wm4
01e3340fb6 swscale: make bilinear scaling the default 
Before this commit, sws_init_context() failed with an error if no scaler
was explicitly set.

Defaulting to something reasonable is better behavior.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-30 18:14:58 +02:00
Paul B Mahol
fc0d8cf185 fate: add fieldorder test 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-30 16:02:42 +00:00
Stefano Sabatini
8fafaf1834 doc: move sws_dither option description to scaler.texi 
That's the more proper place where the scaler options should be
documented.
 2013-09-30 16:54:46 +02:00
Stefano Sabatini
d17aaad630 doc/filters/scale: mention and link scaler options 2013-09-30 16:50:44 +02:00
Stefano Sabatini
fd0a1647f2 doc/filters/scale: fix MAN rendering of @ref arguments 2013-09-30 16:43:33 +02:00
Michael Niedermayer
31b6300f4d doc: try to add a link from the vf_scale sws_flags to the scaler docs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-30 16:09:58 +02:00
Paul B Mahol
0a4aea6db9 avfilter/vf_hflip: support slice threading 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-30 13:08:55 +00:00
Paul B Mahol
2a6a3d4317 avfilter/vf_hflip: refactor plane dimensions calculation 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-30 13:08:55 +00:00
Paul B Mahol
862773907a avfilter/vf_rotate: support slice threading 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-30 13:08:55 +00:00
Michael Niedermayer
54197c7aae skip_bits: dont call UPDATE_CACHE 
UPDATE_CACHE isnt needed and can cause segfaults

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-30 14:34:12 +02:00
Paul B Mahol
f4ab723a79 cmdutils: print command support in -filters. 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-30 10:15:22 +00:00
Michael Niedermayer
0a0b7267b2 configure: fix build with enable-xmm-clobber-test 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-30 12:01:17 +02:00
Timothy Gu
8fd8ead23c doc/t2h.init: remove resource-type and distribution meta elements 
The W3C validator complains about these.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-09-30 11:56:16 +02:00
Michael Niedermayer
b0b5012e77 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Avoid img_segment_size == 0 in mtv demuxer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-30 11:09:32 +02:00
Paul B Mahol
cd1b22d8e8 avfilter/dualinput: simplify 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-30 08:47:40 +00:00
Martin Storsjö
cc41167aed asfdec: Check the return value of asf_read_stream_properties 
This makes sure errors in setting stream parameters are passed
on to the caller. This avoids successfully opening files while
some parameters aren't filled in properly.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-30 10:48:58 +03:00
Carl Eugen Hoyos
e34ba4723e Avoid img_segment_size == 0 in mtv demuxer. 
Fixes ticket #3011.
 2013-09-30 07:55:23 +02:00
Michael Niedermayer
5c7d86cbde Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  omadec: fix bitrate for ATRAC3+ streams

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-30 02:21:41 +02:00
Michael Niedermayer
7a28a9f68e Merge commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3' 
* commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3':
  Add support for multichannel ATRAC3+ streams.

Conflicts:
	libavformat/oma.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-30 02:15:36 +02:00
Michael Niedermayer
c7fae9081d Merge commit '93370d12164236d59645314871a1d6808b2a8ddb' 
* commit '93370d12164236d59645314871a1d6808b2a8ddb':
  mxfdec: set audio timebase to 1/samplerate

Conflicts:
	libavformat/mxfdec.c
	tests/ref/fate/mxf-demux
	tests/ref/seek/lavf-mxf
	tests/ref/seek/lavf-mxf_d10

See: 83cab07a4c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-30 02:12:42 +02:00
Michael Niedermayer
bbe50a8001 Merge commit 'ff07ec143ebd3833fd5a3f4b6c00474ac523a31f' 
* commit 'ff07ec143ebd3833fd5a3f4b6c00474ac523a31f':
  pcx: Return an error on broken palette if err_detect is set to 'explode'

Conflicts:
	libavcodec/pcx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-30 01:54:59 +02:00