x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-08-06 14:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,795 Commits 40 Branches 430 Tags
2e2a2d8801b045b3dd58a4e49e8e040b559bc84a
Commit Graph
56795 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
wm4andMichael Niedermayer 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 GuandStefano Sabatini 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
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
Michael Niedermayer c955bac7d5 Merge commit 'd1d99e3befea5d411ac3aae72dbdecce94f8b547' 
* commit 'd1d99e3befea5d411ac3aae72dbdecce94f8b547':
  pcx: Check the packet size before assuming it fits a palette

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-30 01:49:21 +02:00
Michael Niedermayer 1eead87766 Merge commit '7ba0cedbfeff5671b264d1d7e90777057b5714c6' 
* commit '7ba0cedbfeff5671b264d1d7e90777057b5714c6':
  rpza: Fix a buffer size check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-30 01:42:33 +02:00
Michael Niedermayer 1ad36551ec Merge commit 'aa0dd52434768da64f1f3d8ae92bcf980c1adffc' 
* commit 'aa0dd52434768da64f1f3d8ae92bcf980c1adffc':
  xxan: Disallow odd width

See: 77693c541a
See: 8ad9b48c9b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-30 01:41:17 +02:00
Michael Niedermayer 7d7fb61e0d Merge commit 'fc739b3eefa0b58d64e7661621da94a94dbc8a82' 
* commit 'fc739b3eefa0b58d64e7661621da94a94dbc8a82':
  xan: Only read within the data that actually was initialized

Conflicts:
	libavcodec/xan.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-30 01:21:30 +02:00
Michael Niedermayer b6dfb82913 Merge commit '30db94dc399f6e4ef8905049d9b740556f0fce47' 
* commit '30db94dc399f6e4ef8905049d9b740556f0fce47':
  xan: Use bytestream2 to limit reading to within the buffer

Conflicts:
	libavcodec/xan.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-30 01:12:15 +02:00
Michael Niedermayer a612bb3099 Merge commit '9fb0de86b49e9fb0709a8ad1e1875e35da841887' 
* commit '9fb0de86b49e9fb0709a8ad1e1875e35da841887':
  pcx: Consume the whole packet if giving up due to missing palette

Conflicts:
	libavcodec/pcx.c

See: b4e516e30e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-30 01:00:50 +02:00
Michael Niedermayer 9834874f8c Merge commit 'a81cad8f86d1feb7e4bfae29e43f3e994935a5c7' 
* commit 'a81cad8f86d1feb7e4bfae29e43f3e994935a5c7':
  pngdec: Stop trying to decode once inflate returns Z_STREAM_END

Conflicts:
	libavcodec/pngdec.c

See: 65bf9a44d7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-30 00:40:17 +02:00
Michael Niedermayer 143a19f5c7 Merge commit 'c231987662194d009dd91bfc57c678e0e70ca161' 
* commit 'c231987662194d009dd91bfc57c678e0e70ca161':
  mov: Make sure the read sample count is nonnegative

Conflicts:
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-30 00:32:01 +02:00
Michael Niedermayer ccb6b056df Merge commit '640a2427aafa774b83316b7a8c5c2bdc28bfd269' 
* commit '640a2427aafa774b83316b7a8c5c2bdc28bfd269':
  bfi: Add some very basic sanity checks for input packet sizes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-30 00:13:36 +02:00
Michael Niedermayer a6b79bb2b1 Merge commit '9fc7184d1a9af8d97b3fc5c2ef9d0a647d6617ea' 
* commit '9fc7184d1a9af8d97b3fc5c2ef9d0a647d6617ea':
  bfi: Avoid divisions by zero

See: 99a8552dae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-30 00:12:33 +02:00
Michael Niedermayer 7057cc861d Merge commit 'a9221e39600a31ee13e736e9e47743cde23f0280' 
* commit 'a9221e39600a31ee13e736e9e47743cde23f0280':
  electronicarts: Add more sanity checking for the number of channels

Note: This check is probably unnecessary
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-29 23:52:07 +02:00
Michael Niedermayer 5badcfe220 Merge commit 'd07aa3f02b73ab1371c13ac7898338380ca0932b' 
* commit 'd07aa3f02b73ab1371c13ac7898338380ca0932b':
  riffdec: Add sanity checks for the sample rate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-29 23:41:16 +02:00
Clément Bœsch a89e9ad1c8 swr: fix example code and doxy indent. 2013-09-29 23:37:46 +02:00
Clément Bœsch 565fd3cc1a doc/faq: add @command{} in the tool debug entry. 2013-09-29 23:31:12 +02:00
Clément Bœsch 2e798c6ce0 doc/faq: remove indent in examples. 
CSS should take care of this.
 2013-09-29 23:31:12 +02:00
Clément Bœsch eafb9c52e8 doc/faq: remove Delphi/Pascal entry. 
Link is dead.
 2013-09-29 23:31:12 +02:00
Clément Bœsch e6273592e4 doc/faq: rework r_frame_rate entry. 2013-09-29 23:31:12 +02:00
Michael Niedermayer 2f8418b584 Merge commit '28ff439efd2362fb21e1a78610737f2e26a72d8f' 
* commit '28ff439efd2362fb21e1a78610737f2e26a72d8f':
  mvi: Add sanity checking for the audio frame size

Conflicts:
	libavformat/mvi.c

See: ea1d8465e6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-29 23:24:27 +02:00
Michael Niedermayer 9e58d46edf Merge commit '59480abce7e4238e22b3a4a904a9fe6abf4e4188' 
* commit '59480abce7e4238e22b3a4a904a9fe6abf4e4188':
  alac: Do bounds checking of lpc_order read from the bitstream

See: fd4f4923cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-29 23:17:45 +02:00
Michael Niedermayer 17049bff64 Merge commit 'adc09136a4a63b152630abeacb22c56541eacf60' 
* commit 'adc09136a4a63b152630abeacb22c56541eacf60':
  xwma: Avoid division by zero

Conflicts:
	libavformat/xwma.c

See: a3cb7f992f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-29 22:59:49 +02:00
Michael Niedermayer 3a3ebc7c7d Merge commit '8d07258bb6063d0780ce2d39443d6dc6d8eedc5a' 
* commit '8d07258bb6063d0780ce2d39443d6dc6d8eedc5a':
  avidec: Make sure a packet is large enough before reading its data

Conflicts:
	libavformat/avidec.c

See: 028cc42a16
Note: data!=NULL implies that the allocated array is at least FF_INPUT_BUFFER_PADDING_SIZE large
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-29 22:56:15 +02:00
Michael Niedermayer b24f7cf950 Merge commit '68ff9981283a56c731f00c2ee7901103665092fc' 
* commit '68ff9981283a56c731f00c2ee7901103665092fc':
  vqf: Make sure the bitrate is in the valid range

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-29 22:42:31 +02:00
Michael Niedermayer 554c22c710 Merge commit '9277050e2918e0a0df9689721a188a604d886616' 
* commit '9277050e2918e0a0df9689721a188a604d886616':
  vqf: Make sure sample_rate is set to a valid value

See: e481ba2ed7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-29 22:35:06 +02:00
Maxim PoliakovskiandAnton Khirnov 487b54104a omadec: fix bitrate for ATRAC3+ streams 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-09-29 21:54:51 +02:00
Maxim PoliakovskiandAnton Khirnov 23d0fdcf6f Add support for multichannel ATRAC3+ streams. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-09-29 21:52:57 +02:00
Anton Khirnov 93370d1216 mxfdec: set audio timebase to 1/samplerate 
Fixes sync in some samples (e.g. bugs 7581 and 8374 in VLC).
Based on a commit by Matthieu Bouron <matthieu.bouron@gmail.com>

Reported-by: Jean-Baptiste Kempf <jb@videolan.org>
CC: libav-stable@libav.org
 2013-09-29 21:50:30 +02:00
Michael Niedermayer 4be0c6ed20 avcodec/tiff_common: fix bprint max sizes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-29 21:28:22 +02:00
Paul B Mahol 61274193e3 avfilter/vf_rotate: use vsub for output plane height calculation 
Output plane height used horizontal instead of vertical subsampling.
This is just cosmetic change as filter does not support formats where
vertical subsampling does not match horizontal one.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-29 19:24:27 +00:00
Martin Storsjö ff07ec143e pcx: Return an error on broken palette if err_detect is set to 'explode' 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-29 21:05:16 +03:00