wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
58300 commits 40 branches 405 tags 230 MiB
Commit graph

26281 commits

Author SHA1 Message Date
Michael Niedermayer
6c04c5f733 avcodec/h261enc: dont use current_mv_x/y 
Fixes -mbd rd
Fixes Ticket3151

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-20 15:28:46 +01:00
Michael Niedermayer
cccdaa406a avcodec/h261enc: avoid use of current/previous_mba 
Fixes part of Ticket3151

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-20 15:14:01 +01:00
Michael Niedermayer
61f40fbb52 Merge commit 'ffb0af7f17' 
* commit 'ffb0af7f17':
  ac3dec: simplify an expression

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-20 04:20:36 +01:00
Michael Niedermayer
05493c6e72 avcodec/avpacket: correctly set the number of side data elements in av_copy_packet_side_data() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-20 00:23:23 +01:00
Michael Niedermayer
d5d29ae3b0 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dv_tablegen: Remove CONFIG_SMALL preprocessor check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-19 22:03:27 +01:00
Tim Walker
ffb0af7f17 ac3dec: simplify an expression 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-11-19 18:52:17 +01:00
Michael Niedermayer
066dbfe165 Merge commit '6f1ec8edf2' 
* commit '6f1ec8edf2':
  avcodec.h: include version.h before using version macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-19 18:19:06 +01:00
Michael Niedermayer
8983dea426 Merge commit 'c673fc919c' 
* commit 'c673fc919c':
  hevc_sei: drop unused parameter

Conflicts:
	libavcodec/hevc_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-19 17:59:47 +01:00
Michael Niedermayer
2c6e693c97 Merge commit 'd234c7a07c' 
* commit 'd234c7a07c':
  mpeg4videodec: K&R formatting cosmetics

Conflicts:
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-19 17:53:14 +01:00
Michael Niedermayer
18df75fa2f Merge commit '8769113acc' 
* commit '8769113acc':
  mpeg4videoenc: K&R formatting cosmetics

Conflicts:
	libavcodec/mpeg4videoenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-19 16:19:42 +01:00
Diego Biurrun
57f13fd7e9 dv_tablegen: Remove CONFIG_SMALL preprocessor check 
The code does in no way depend on CONFIG_SMALL.
 2013-11-19 16:04:27 +01:00
Vittorio Giovara
6f1ec8edf2 avcodec.h: include version.h before using version macro 2013-11-19 14:48:36 +01:00
Vittorio Giovara
c673fc919c hevc_sei: drop unused parameter 2013-11-19 14:48:36 +01:00
Vittorio Giovara
d234c7a07c mpeg4videodec: K&R formatting cosmetics 2013-11-19 14:48:36 +01:00
Vittorio Giovara
8769113acc mpeg4videoenc: K&R formatting cosmetics 2013-11-19 14:48:36 +01:00
Michael Niedermayer
32ab5b82f4 Merge commit '69d4dbfd1f' 
* commit '69d4dbfd1f':
  aac_ac3_parser: simplify an expression

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-19 04:14:21 +01:00
Michael Niedermayer
8540368582 Merge commit '37a3cac78c' 
* commit '37a3cac78c':
  dcadec: simplify an expression

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-19 04:09:03 +01:00
Michael Niedermayer
56e122787e Merge commit 'a553c6a347' 
* commit 'a553c6a347':
  lavc: use buf[0] instead of data[0] in checks whether a frame is allocated

Conflicts:
	libavcodec/h264_refs.c
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-19 03:56:53 +01:00
Kostya Shishkov
16e7b189c5 mpegvideo: Fix swapping of UV planes for VCR2 2013-11-19 02:05:51 +01:00
Tim Walker
69d4dbfd1f aac_ac3_parser: simplify an expression 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-11-19 02:02:53 +01:00
Tim Walker
37a3cac78c dcadec: simplify an expression 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-11-19 02:02:49 +01:00
Michael Niedermayer
f0f04fd842 avcodec/asvenc: remove code allocating dummy coded_frame 
Fixes memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-18 23:21:20 +01:00
Michael Niedermayer
918cab1a9f avcodec/pcm-dvd: print actual block size values in block size changed warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-18 21:00:03 +01:00
Michael Niedermayer
4adf1fe34f avcodec/pcm-dvd: fix incorrectly printed warning about changed block sizes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-18 21:00:03 +01:00
Michael Niedermayer
ab184b298d avcodec/pcm-dvd: fix 20/24bit 1 channel 
Fixes part of ticket3122

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-18 21:00:03 +01:00
Michael Niedermayer
5db49fc38d avcodec/pcm-dvd: fix 20bit 2 channels 
Fixes part of ticket3122

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-18 21:00:03 +01:00
Carl Eugen Hoyos
2974050cf5 Add a lavc Makefile dependency for the elbg filter. 
Fixes compilation with --disable-encoders

Reported by trac user Julian in ticket #3140.
 2013-11-18 18:12:11 +01:00
Anton Khirnov
a553c6a347 lavc: use buf[0] instead of data[0] in checks whether a frame is allocated 
data[0] may be NULL for valid frames with hwaccel pixel formats.
 2013-11-18 18:09:48 +01:00
Carl Eugen Hoyos
3f2ce316cd Add a Makefile rule for the little-endian G.726 decoder. 
Fixes compilation with --disable-everything --enable-decoder=adpcm_g726le
 2013-11-18 17:51:28 +01:00
Paul B Mahol
74906d3727 avcodec/libopusenc: change default frame duration to 20 ms 
20 ms is used by libopus encoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-18 01:46:32 +00:00
Michael Niedermayer
cda3c00475 avcodec/h261enc: remove unused variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-18 10:04:17 +01:00
Clément Bœsch
260fc0d95b avcodec/libxavs: 2nd attempt to fix compilation after b18c7c8d. 2013-11-18 08:08:41 +01:00
Clément Bœsch
71cd83e34c avcodec/libxavs: attempt to fix compilation after b18c7c8d. 2013-11-18 07:53:15 +01:00
Vallimar
6f8a27dd3b avcodec/old_codec_ids: fix missing FF_API_XVMC check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-18 01:22:30 +01:00
Clément Bœsch
e0434cfcfc avcodec/x86: remove 3 sub in pred4x4_tm_vp8_8. 
before:
  411 decicycles in ff_pred4x4_tm_vp8_8_ssse3, 8388289 runs, 319 skips

after:
  389 decicycles in ff_pred4x4_tm_vp8_8_ssse3, 8388308 runs, 300 skips

Tested on i7 920.
 2013-11-17 23:12:35 +01:00
Michael Niedermayer
c017f15dde qpeg: remove faulty avcodec_get_frame_defaults() 
Found-by: {V}
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-17 21:20:17 +01:00
Michael Niedermayer
9f630e8346 avcodec/mpegaudioenc: prevent overflow in fixed point code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-17 21:14:15 +01:00
Michael Niedermayer
c3814ab654 rename new lls code to lls2 to avoid conflict with the old which has a different ABI 
also remove failed attempt at a compatibility layer, the code simply cannot work

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-17 16:41:08 +01:00
Michael Niedermayer
bbe66ef912 avutil: rename lls to lls2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-17 16:30:23 +01:00
Michael Niedermayer
331a90cec4 avcodec/h261: trellis quantization support 
Fixes ticket3143

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-17 15:08:56 +01:00
Michael Niedermayer
be1e6e7503 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpegvideo_enc: use the AVFrame API properly.
  ffv1: use the AVFrame API properly.
  jpegls: use the AVFrame API properly.
  huffyuv: use the AVFrame API properly.

Conflicts:
	libavcodec/ffv1.c
	libavcodec/ffv1.h
	libavcodec/ffv1dec.c
	libavcodec/ffv1enc.c

Changes to ffv1 are more redone than merged due to them being based on
an ancient codebase and a good part of that having being done already
as well.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-17 13:55:50 +01:00
Michael Niedermayer
f4f7888bab Merge commit 'ffe04c3303' 
* commit 'ffe04c3303':
  libxvid: use the AVFrame API properly.
  pcxenc: use the AVFrame API properly.
  roqvideo: remove unused variables
  libschroedingerenc: use the AVFrame API properly.

Conflicts:
	libavcodec/pcxenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-17 12:41:42 +01:00
Michael Niedermayer
a0c0629dd9 Merge commit '97168b204a' 
* commit '97168b204a':
  eatgv: use the AVFrame API properly.
  libxavs: use the AVFrame API properly.
  nuv: use the AVFrame API properly.
  flashsvenc: use the AVFrame API properly.

Conflicts:
	libavcodec/eatgv.c
	libavcodec/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-17 12:33:27 +01:00
Michael Niedermayer
5b0c70c249 Merge commit '57e7b3a89f' 
* commit '57e7b3a89f':
  dnxhdenc: use the AVFrame API properly.
  libx264: use the AVFrame API properly.
  svq1enc: use the AVFrame API properly.
  gif: use the AVFrame API properly.

Conflicts:
	libavcodec/gif.c
	libavcodec/svq1enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-17 12:19:55 +01:00
Michael Niedermayer
3ea168edeb Merge commit '45bde93eef' 
* commit '45bde93eef':
  sunrastenc: use the AVFrame API properly.
  targaenc: use the AVFrame API properly.
  tiffenc: use the AVFrame API properly.
  pngenc: use the AVFrame API properly.

Conflicts:
	libavcodec/pngenc.c
	libavcodec/sunrastenc.c
	libavcodec/targaenc.c
	libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-17 12:06:34 +01:00
Michael Niedermayer
85b7b0c519 Merge commit '0ea430c75b' 
* commit '0ea430c75b':
  lclenc: use the AVFrame API properly.

Conflicts:
	libavcodec/lclenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-17 11:46:51 +01:00
Michael Niedermayer
92cbd77568 Merge commit 'd48c206302' 
* commit 'd48c206302':
  qtrleenc: use the AVFrame API properly.
  ulti: use the AVFrame API properly.
  vc1: use the AVFrame API properly.
  flashsv: use the AVFrame API properly.

Conflicts:
	libavcodec/flashsv.c
	libavcodec/qtrleenc.c
	libavcodec/ulti.c
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-17 03:31:32 +01:00
Michael Niedermayer
9ad477d909 Merge commit 'e4155f15b3' 
* commit 'e4155f15b3':
  eamad: use the AVFrame API properly.
  dpxenc: use the AVFrame API properly.
  bmpenc: use the AVFrame API properly.
  sgienc: use the AVFrame API properly.

Conflicts:
	libavcodec/bmpenc.c
	libavcodec/dpxenc.c
	libavcodec/eamad.c
	libavcodec/sgienc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-17 03:17:48 +01:00
Michael Niedermayer
8d193a24f2 Merge commit '730bac7bab' 
* commit '730bac7bab':
  mss4: use the AVFrame API properly.
  mss3: use the AVFrame API properly.
  mss2: use the AVFrame API properly.
  mss1: use the AVFrame API properly.

Conflicts:
	libavcodec/mss1.c
	libavcodec/mss2.c
	libavcodec/mss3.c
	libavcodec/mss4.c

See: 02fe531afe
See: ff1c13b133
See: 310bf28354
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-17 02:48:17 +01:00
Michael Niedermayer
72df87088c Merge commit '508b37557b' 
* commit '508b37557b':
  tiertexseqv: use the AVFrame API properly.
  smc: use the AVFrame API properly.
  truemotion2: use the AVFrame API properly.
  truemotion1: use the AVFrame API properly.

Conflicts:
	libavcodec/smc.c
	libavcodec/tiertexseqv.c
	libavcodec/truemotion1.c
	libavcodec/truemotion2.c

See: e999f2339a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-17 02:35:23 +01:00