RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
57,235 Commits 36 Branches 398 Tags 242 MiB
Commit Graph

57235 Commits

Author SHA1 Message Date
Michael Niedermayer 57c018d542 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fate: Increase the tolerance in the lavr tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 20:15:22 +02:00
Michael Niedermayer 123c6ca809 Merge commit 'f52fd3f3b26f0d80e4f0b374b7695383feca5b92' 
* commit 'f52fd3f3b26f0d80e4f0b374b7695383feca5b92':
  fate: aac: Add test for AAC-LD

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 19:51:12 +02:00
Stefano Sabatini 904c89ac1b lswr/swresample: convert ocl and icl options to AV_OPT_TYPE_CHANNEL_LAYOUT 
Improve interface flexibility. In particular makes it possible to set
channel layout through symbolic names using the av_opt_set() interface.
 2013-10-17 18:09:54 +02:00
Martin Storsjö a27f1116cd fate: Increase the tolerance in the lavr tests 
A few fate instances on OS/2, OpenBSD, FreeBSD and IA64 linux currently
still fail a few tests with a maxdiff of 6.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-10-17 19:09:50 +03:00
Stefano Sabatini 8696e51baf lavu/opt: add AV_OPT_TYPE_CHANNEL_LAYOUT and handler functions 
The new type is compatible with AV_OPT_TYPE_INT64, but allows to specify
channel layouts using the format accepted by av_get_channel_layout().
 2013-10-17 18:09:29 +02:00
Stefano Sabatini d96e377c39 lavu/channel_layout: change av_get_channel_layout() behavior at the next bump 
The new syntax is preferred since it allows backward syntax compatibility
with libswr when switching to the new option handling code with
AV_OPT_TYPE_CHANNEL_LAYOUT.

With the new parser the string:
1234

is interpreted as a channel layout mask, rather than as a number of
channels, and thus it's compatible with the current way to set a channel
layout as an integer (e.g. for the icl and ocl options) making use of
integer option values.

ff_get_channel_layout() with compat=0 will be used in the
AV_OPT_TYPE_CHANNEL handler code.

The user is encouraged to switch to the new forward compatible syntax,
which requires to put a trailing "c" when specifying a layout as a number
of channels.
 2013-10-17 18:03:09 +02:00
Stefano Sabatini b236eb49e1 lavu/opt.h: fix grammar typo in av_opt_get* doxy 2013-10-17 18:03:03 +02:00
Stefano Sabatini 98e7c1eed5 lavu/opt-test: use automatic set and free handlers 
In particular, do not set default string value by hand and use
av_opt_free() to free context.
 2013-10-17 18:02:54 +02:00
Michael Niedermayer d0a3bc1302 swscale/yuv2rgb: clip cy, avoid division by 0 with 0 contrast 
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 14:02:43 +02:00
Michael Niedermayer 2db6547237 swscale/utils/sws_setColorspaceDetails(): fix indention 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 14:02:43 +02:00
Diego Biurrun f52fd3f3b2 fate: aac: Add test for AAC-LD 2013-10-17 12:36:35 +02:00
Michael Niedermayer f90eb8cfc8 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Add some necessary casts in the wtv demuxer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 10:42:41 +02:00
Dirk Farin 56cf6151ae avformat/hevcdec: add more irap cases to hevc_probe() 
This fixes fate-hevc-conformance-RAP_A_docomo_4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 10:18:28 +02:00
Dirk Farin 2ac31773f3 avformat/hevcdec: cosmetics, whitespaces 
This reduces the difference to the latest hevc demuxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 10:14:11 +02:00
Carl Eugen Hoyos a0d13d84a9 Add some necessary casts in the wtv demuxer. 
This reverts e8023dba, fixes ticket #3049.
 2013-10-17 09:54:03 +02:00
Michael Niedermayer 21b3563dcb Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mem: Make av_strdup allocate using av_realloc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 08:13:42 +02:00
Mickaël Raulet a7e300649a hevc: fix pcm with different chroma luma bit widths(cherry picked from commit 6a444516f338424d062c0ef2806714036283603b) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 02:42:11 +02:00
Mickaël Raulet b494894390 hevc: optimize residual coding(cherry picked from commit 70692a44708157b4dfa50e402e446bfa2b27f55e) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 02:41:51 +02:00
Michael Niedermayer 3ed65d98c6 avutil/log: fix race between setting and using the log callback 
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 00:49:55 +02:00
Michael Niedermayer 9a63a45e48 doc/utils: fix docs build 
Not sure this is the correct solution but that can be investigated too once
the docs build again

Tested-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 22:32:47 +02:00
Paul B Mahol 37d6b2b4e6 swsscale/swscale_unscaled: add GBRAP16 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 20:44:12 +02:00
Michael Niedermayer 9ec9d46365 swscale/swscale_unscaled: fix alpha pointer & stride for planarRgb16ToRgb16Wrapper() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 20:44:12 +02:00
Timothy Gu 586b8ea248 doc/filters: reference ffmpeg-utils manual for color and sizes options 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-16 18:32:15 +02:00
Timothy Gu 155a5ff00d doc/utils: reformat doc for color syntax and add list of supported colors 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-16 18:32:15 +02:00
Timothy Gu b4da1fa550 doc/utils: rewrite doc for time duration syntax 
Extend description and clarify syntax.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-16 18:32:15 +02:00
Martin Storsjö d433e1aefa mem: Make av_strdup allocate using av_realloc 
This makes sure that pointers from av_strdup are reallocable,
which is used in av_dict_set if the AV_DICT_APPEND flag is set.

Nothing should rely on pointers from av_strdup being aligned.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-10-16 18:59:01 +03:00
Carl Eugen Hoyos d0b7d24b80 Support HEVC in transport streams. 2013-10-16 17:54:37 +02:00
Ronald S. Bultje 734ccf3785 avcodec/vp9: fix band_counts array size / padding 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 17:17:47 +02:00
Paul B Mahol 4413dcc035 avcodec/exr: piz decompression 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-16 14:54:59 +00:00
Michael Niedermayer 4d41a25d39 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpegvideo: Move 8x8 in a separate function

Conflicts:
	libavcodec/mpegvideo_motion.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 15:08:10 +02:00
Michael Niedermayer 8210e38461 Merge commit '95587859cc69e5abe37c9e3af48008032d98e262' into HEAD 
* commit '95587859cc69e5abe37c9e3af48008032d98e262':
  mpegvideo: Move obmc in a separate function

Conflicts:
	libavcodec/mpegvideo_motion.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 14:51:00 +02:00
Michael Niedermayer ab16d5b7b5 Merge commit 'a90905db2e6ab1840890f3a88bfd3bf008b9d886' 
* commit 'a90905db2e6ab1840890f3a88bfd3bf008b9d886':
  ffv1: Assume bitdepth 0 means 8bit

Conflicts:
	libavcodec/ffv1dec.c

Note, FFmpeg is not affected by this bug

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 14:02:43 +02:00
Michael Niedermayer 8610751d07 Merge commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860' 
* commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860':
  mpegvideo: K&R formatting cosmetics

Conflicts:
	libavcodec/mpegvideo_motion.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 13:54:41 +02:00
Michael Niedermayer 10c6d1b28c Merge commit '93f305473f880729d18b5e42067f19d2106cb2e5' 
* commit '93f305473f880729d18b5e42067f19d2106cb2e5':
  lavc: Convert some remaining strides to ptrdiff_t

Conflicts:
	libavcodec/h264.h
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_motion.c
	libavcodec/vp56.c
	libavcodec/wmv2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 13:08:37 +02:00
Michael Niedermayer f7f74a37b8 Merge commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208' 
* commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208':
  h264_parser: Fix POC parsing for the case where MMCO_RESET is present.

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 12:51:26 +02:00
Michael Niedermayer 91248f081f Merge commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9' 
* commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9':
  h264_parser: Fix POC parsing for the case where MMCO_RESET is absent.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 12:39:02 +02:00
Michael Niedermayer 83bfcc3ce2 Merge commit '6b081eff4dfc3c899960f69f30cb567266b7dca3' 
* commit '6b081eff4dfc3c899960f69f30cb567266b7dca3':
  fate: add vorbiscomment cover art test

Conflicts:
	tests/fate/cover-art.mak

See: 1ca3902726
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 12:23:34 +02:00
Michael Niedermayer 8778c49ace Merge commit '68edd5be0980941924ae633d98589d56a8091bbd' 
* commit '68edd5be0980941924ae633d98589d56a8091bbd':
  FATE: use proper comparison mode in the lavr tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 12:12:21 +02:00
Michael Niedermayer 6659eb7116 Merge commit 'dd33637c18629c3e554ebb146bbeb45c9745a5cf' 
* commit 'dd33637c18629c3e554ebb146bbeb45c9745a5cf':
  tiny_psnr: switch f32 handling to floating point

Conflicts:
	tests/tiny_psnr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 12:07:02 +02:00
Michael Niedermayer 8895b71d6f Merge commit '29c455ce3daf7fb369ba20cf77c74bd8e3b43b55' 
* commit '29c455ce3daf7fb369ba20cf77c74bd8e3b43b55':
  bitstream: Check the result of av_malloc()

Conflicts:
	libavcodec/bitstream.c

See: aa74810fc6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 11:30:17 +02:00
Michael Niedermayer 3a8b52c011 Merge commit '3b4fa54866f58bf3d8a8dcc460c73ef6564c0ad8' 
* commit '3b4fa54866f58bf3d8a8dcc460c73ef6564c0ad8':
  cavs: more K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 11:12:23 +02:00
Michael Niedermayer 12e9821042 Merge commit 'c0085f94fea89b180e5727b193484a83586d3490' 
* commit 'c0085f94fea89b180e5727b193484a83586d3490':
  mpegaudio_tablegen: Don't use llrint
  cos_tablegen: Don't use lrint
  tablegen: Don't use cbrtf in host tools
  tableprint: Fix use of a size_t print with MSVC

Conflicts:
	libavcodec/cbrt_tablegen.h
	libavcodec/mpegaudio_tablegen.h

See: e516921143
See: 5086720993
See: 008014b5e7
See: 00aa24ffee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 10:56:22 +02:00
Mickaël Raulet 64b3aaf8f6 hevc: fixing TSCL_A_VIDYO_5 decoding output order(cherry picked from commit 19c5d9ed28606e7a166d180fc9f1517cb174146f) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 01:48:11 +02:00
Michael Niedermayer 48e1114abf fate: fix DBLK_A_MAIN10_VIXS_2 on big endian 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 01:26:50 +02:00
Guillaume Martres fb3cea4be3 FATE: add HEVC tests 
The tests are disabled as 2 do not pass yet
(fate-hevc-conformance-PPS_A_qualcomm_7 and fate-hevc-conformance-RAP_A_docomo_4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 01:25:58 +02:00
Michael Niedermayer f58cb772d9 avformat/mov: fix "correctly" typo 
Found-by: Timothy Gu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 00:26:10 +02:00
Yusuke Nakamura 16b6839de6 lavf/matroskadec: Support HEVC demuxing. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 00:17:28 +02:00
Yusuke Nakamura 53f903b7c5 lavf/mov: Support HEVC demuxing. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 00:17:28 +02:00
gcocherel cf49d0156d valgrind cleanup(cherry picked from commit 0d5efa40b94c0de92a1fe5091b21e0e2d36bae3d) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 00:17:28 +02:00
Luca Barbato 825c7c62bb mpegvideo: Move 8x8 in a separate function 2013-10-15 23:58:20 +02:00