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

55336 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Niedermayer
a68b6ec7f5 avutil/hmac: make const tables static const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 20:30:55 +02:00
Michael Niedermayer
9e10b2cfc9 avformat/spdifenc make const tables static const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 20:30:36 +02:00
Michael Niedermayer
ef71717901 avformat/smoothstreamingenc: Make const tables static const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 20:30:12 +02:00
Michael Niedermayer
5b13778f93 mpegts: remove usage of MOD_UNLIKELY() 
Its not needed and doing nothing is faster than doing a optimized MOD

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 19:56:20 +02:00
Michael Niedermayer
aa24729c21 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  pcm_bluray: Return AVERROR_INVALIDDATA instead of -1 on header errors

Conflicts:
	libavcodec/pcm-mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 19:40:50 +02:00
Michael Niedermayer
66328da700 Merge commit '6fb65973c9' 
* commit '6fb65973c9':
  configure: Properly split dv1394 indev dependencies

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 19:33:46 +02:00
Michael Niedermayer
c32db6adab Merge commit '61c31e4ee7' 
* commit '61c31e4ee7':
  configure: Properly set zlib dependencies for all components

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 19:29:27 +02:00
Michael Niedermayer
05f1b4e2ec Merge commit 'a7d45e06e9' 
* commit 'a7d45e06e9':
  configure: The W64 demuxer should select the WAV demuxer, not depend on it

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 19:22:00 +02:00
Michael Niedermayer
1faece7ecc Merge commit '406e6c0ba5' 
* commit '406e6c0ba5':
  configure: Properly split avserver component and system dependencies

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 19:04:04 +02:00
Michael Niedermayer
0a8f5eb23a Merge commit '255d9c570e' 
* commit '255d9c570e':
  riff: Move demuxing code to a separate file.

Conflicts:
	configure
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 18:30:47 +02:00
Michael Niedermayer
508a5349da Merge commit '3dd5c95dee' 
* commit '3dd5c95dee':
  riff: Move muxing code to a separate file

Conflicts:
	configure
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 18:08:30 +02:00
Michael Niedermayer
7565aaecb4 Merge commit 'fcc455ff2e' 
* commit 'fcc455ff2e':
  avformat/dv: K&R formatting cosmetics

Conflicts:
	libavformat/dv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 18:01:03 +02:00
Michael Niedermayer
89efaabc99 Merge commit 'abe5268c33' 
* commit 'abe5268c33':
  tcp: Use a different log message and level if there's more addresses to try

Conflicts:
	libavformat/tcp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 17:53:01 +02:00
Michael Niedermayer
287f7d0ae1 Merge commit '2a0ec47bd7' 
* commit '2a0ec47bd7':
  unix: Convert from AVERROR to errno range before comparing error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 17:24:50 +02:00
Michael Niedermayer
83db013a06 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avcodec/options: Drop deprecation warning suppression macros

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 16:48:31 +02:00
Michael Niedermayer
f5b2718c0a Merge commit '971cce7ebb' 
* commit '971cce7ebb':
  riff.h: Remove stray extern declaration for non-existing symbol

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 16:41:44 +02:00
Michael Niedermayer
7d03e60c12 Merge commit '86f4c59bd6' 
* commit '86f4c59bd6':
  twinvq: Split VQF-specific part from common TwinVQ decoder core

Conflicts:
	libavcodec/Makefile
	libavcodec/twinvq.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 16:37:08 +02:00
Michael Niedermayer
a97f749990 Merge commit '4d8d16b596' 
* commit '4d8d16b596':
  twinvq: Prefix enums and defines shared with VoxWare MetaSound

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 16:29:35 +02:00
Michael Niedermayer
9648c8e57b Merge commit 'bc909626b0' 
* commit 'bc909626b0':
  twinvq: move all bitstream reading into single place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 16:24:08 +02:00
Michael Niedermayer
0df55e1ba8 Merge commit 'a22ae9f0c5' 
* commit 'a22ae9f0c5':
  mpegts: Remove one 64-bit integer modulus operation per packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 16:23:32 +02:00
Michael Niedermayer
91062ddef1 Merge commit '43bacd5b7d' 
* commit '43bacd5b7d':
  vc1: check mb_height validity.

See: b5f4836f8c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 16:07:37 +02:00
Michael Niedermayer
f606c6e92c Merge commit '090cd06311' 
* commit '090cd06311':
  vc1: check the source buffer in vc1_mc functions

Conflicts:
	libavcodec/vc1dec.c

See: 3a04c18d89
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 15:57:35 +02:00
Michael Niedermayer
06fd4e45d9 Merge commit '9991298f2c' 
* commit '9991298f2c':
  bink: Bound check the quantization matrix.

See: e70144cba1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 15:53:27 +02:00
Michael Niedermayer
2539767206 Merge commit 'bb9378251a' 
* commit 'bb9378251a':
  network: Use SOCK_CLOEXEC when available

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 15:40:05 +02:00
Michael Niedermayer
8d06ce7941 Merge commit '605387582b' 
* commit '605387582b':
  lavf: Support unix sockets

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 15:33:12 +02:00
Michael Niedermayer
560e9365b6 Merge commit 'bc54c2ae3c' 
* commit 'bc54c2ae3c':
  libx264: add shortcut for the bluray compatibility option

Conflicts:
	doc/encoders.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 15:26:04 +02:00
Michael Niedermayer
5dd8ca7d1b Merge commit 'c84ea750cf' 
* commit 'c84ea750cf':
  mpegts: Make discard_pid() faster for single-program streams

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 15:16:35 +02:00
Michael Niedermayer
4ed0b28a45 Merge commit 'cabb168169' 
* commit 'cabb168169':
  mpegts: Remove one memcpy per packet

Conflicts:
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 15:11:55 +02:00
Michael Niedermayer
8878aef048 Merge commit 'daf1e0d3de' 
* commit 'daf1e0d3de':
  avio: Add an internal function for reading without copying

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 15:02:27 +02:00
Michael Niedermayer
7ed002d791 Merge commit '22a154e436' 
* commit '22a154e436':
  build: Add missing img2.o dependency to apetag.o

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 14:56:22 +02:00
Michael Niedermayer
1dfb34db6d Merge commit 'bea3d6f436' 
* commit 'bea3d6f436':
  ismindex: Replace mkdir ifdeffery by os_support.h #include

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 14:50:27 +02:00
Michael Niedermayer
318d7a9638 avcodec/vdpau: include attributes.h, needed for attribute_deprecated 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 14:49:03 +02:00
Michael Niedermayer
66056f74a1 avcodec/vdpau.h: define FF_API_BUFS_VDPAU if its not defined 
Similar to 50fb8c1114

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 14:48:54 +02:00
Michael Niedermayer
9547e3eef3 Merge commit 'f824535a4a' 
* commit 'f824535a4a':
  vdpau: deprecate bitstream buffers within the hardware context

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 14:30:49 +02:00
Michael Niedermayer
c3b2902320 Merge commit '2852740e23' 
* commit '2852740e23':
  vdpau: store picture data in picture's rather than codec's context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 14:25:26 +02:00
Michael Niedermayer
50fb8c1114 avcodec/vdpau.h: define FF_API_CAP_VDPAU if its not defined 
Prevent build failure for applicatins using the old API
This could be replaced be a include of version.h but some applications
would then need extern C wrapers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 14:15:17 +02:00
Michael Niedermayer
3b805dcaa9 Merge commit '549294fbbe' 
* commit '549294fbbe':
  vdpau: deprecate VDPAU codec capability

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 13:54:05 +02:00
Michael Niedermayer
4ee0984341 Merge commit 'a0ad5d0113' 
* commit 'a0ad5d0113':
  vdpau: deprecate old codec-specific pixel formats

Conflicts:
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 13:45:21 +02:00
Michael Niedermayer
bf36dc50ea Merge commit '578ea75a9e' 
* commit '578ea75a9e':
  vdpau: remove old-style decoders

Conflicts:
	libavcodec/allcodecs.c
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg4videodec.c
	libavcodec/vc1dec.c
	libavcodec/vdpau.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 13:24:22 +02:00
Christian Schmidt
1c6d2bb9a9 pcm_bluray: Return AVERROR_INVALIDDATA instead of -1 on header errors 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-08-06 13:19:29 +02:00
Michael Niedermayer
b7fc2693c7 Merge commit '488a0fa689' 
* commit '488a0fa689':
  avconv: support -t as an input option.

Conflicts:
	Changelog
	ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 12:41:04 +02:00
Michael Niedermayer
6d77279ed8 ffmpeg_opt: Remove support for specifying -t anywhere to set the duration 
This would otherwise conflict with the semantics of using -t for the input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 12:06:28 +02:00
Michael Niedermayer
7cbef2ed7e Merge commit '811bd07846' 
* commit '811bd07846':
  avconv: make input -ss accurate when transcoding

Conflicts:
	Changelog
	doc/ffmpeg.texi
	ffmpeg.h
	ffmpeg_filter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 11:39:09 +02:00
Diego Biurrun
6fb65973c9 configure: Properly split dv1394 indev dependencies 2013-08-06 11:23:00 +02:00
Diego Biurrun
61c31e4ee7 configure: Properly set zlib dependencies for all components 2013-08-06 11:23:00 +02:00
Diego Biurrun
a7d45e06e9 configure: The W64 demuxer should select the WAV demuxer, not depend on it 2013-08-06 11:23:00 +02:00
Diego Biurrun
406e6c0ba5 configure: Properly split avserver component and system dependencies 2013-08-06 11:23:00 +02:00
Diego Biurrun
255d9c570e riff: Move demuxing code to a separate file. 2013-08-06 11:02:36 +02:00
Diego Biurrun
3dd5c95dee riff: Move muxing code to a separate file 2013-08-06 11:02:35 +02:00
Diego Biurrun
fcc455ff2e avformat/dv: K&R formatting cosmetics 2013-08-06 11:01:44 +02:00