generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
61,585 Commits 24 Branches 241 Tags 173 MiB
61ad2b42a1
Commit Graph

61585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
61ad2b42a1 Merge commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1' 
* commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1':
  sbrdsp: move #if to disable all educational code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 19:59:00 +01:00
Michael Niedermayer
ae9b468b08 Merge commit 'c829b35c08ad8e1df45cca1cd12f084cf1183d07' 
* commit 'c829b35c08ad8e1df45cca1cd12f084cf1183d07':
  lavc: er: remove unused variable size

No change as the variable is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 19:52:44 +01:00
James Almer
3d48cbc56c swresample: reuse COMMON_CORE asm where possible 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 16:08:34 +01:00
Daniel Verkamp
cf3fccce06 ff_put_wav_header: remove manual byte counting 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 15:54:37 +01:00
James Almer
7c8bf09edd swresample: change COMMON_CORE_INT16 asm from SSSE3 to SSE2 
pshuf+paddd is slightly faster than phaddd.
The real gain is in pre-ssse3 processors like AMD K8 and K10, which get
a big boost in performance compared to the mmxext version

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 15:00:50 +01:00
Michael Niedermayer
c56d25c476 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  svq3: directly set pix_fmt and color_range

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 14:08:40 +01:00
Michael Niedermayer
7ae5cadb0a Merge commit 'ca80e15814b77efe8d0ff5a5b0220754bb6c4065' 
* commit 'ca80e15814b77efe8d0ff5a5b0220754bb6c4065':
  mpegts: Forward error codes in various functions

Conflicts:
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 13:30:20 +01:00
Michael Niedermayer
ceb0d79f46 Merge commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a' 
* commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a':
  mpegts: K&R formatting cosmetics

Conflicts:
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 13:19:24 +01:00
Janne Grunau
d961a79eb0 sbrdsp: move #if to disable all educational code 
Avoids a warning of the unused function 'autocorrelate'.
 2014-03-18 13:08:00 +01:00
Janne Grunau
c829b35c08 lavc: er: remove unused variable size 
The code using it was removed in d66e305bd1.
 2014-03-18 13:07:52 +01:00
Vittorio Giovara
3795ec6858 svq3: directly set pix_fmt and color_range 2014-03-18 08:21:29 +01:00
Keiji Costantini
ca80e15814 mpegts: Forward error codes in various functions 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-03-18 08:20:35 +01:00
Keiji Costantini
86ba2327e1 mpegts: K&R formatting cosmetics 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-03-18 08:07:43 +01:00
Michael Niedermayer
48f7d5f0cf avfilter/src_movie: Check that the pixel format hasnt changed 
Fixes assertion failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 03:59:20 +01:00
Michael Niedermayer
aa86cccd11 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 02:07:24 +01:00
Marton Balint
2daf6be011 MAINTAINERS: add myself az mpegts demuxer maintainer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 02:05:44 +01:00
Michael Niedermayer
8ab8070784 avcodec/utils: fix sizeof(AVFrame) dependence in avcodec_encode_audio2() 
This is a bit tricky, we allocate a correctly sized AVFrame but then only
copy the compile time AVFrame size, this is to ensure that user applications
which do not use the correct av frame API dont end with out of array reads.
Note, applications using the correct API have set extended_data and the
changed code will never be executed for them.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 02:03:30 +01:00
Carl Eugen Hoyos
bb97bcec6b Fix TARGET_SAMPLES and TARGET_PATH for some fate tests. 
This allows running more fate tests on remote targets
without the source tree.
 2014-03-18 01:29:50 +01:00
James Almer
aa1f38015c x86/synth_filter: improve FMA version 
Replace mulps+subps with fnmaddps, resulting in two less instructions inside the
inner loops.
About 1% faster FMA3 performance.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 21:04:15 +01:00
Andrey Utkin
e10ab43614 doc/examples: Add example transcoding.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 20:56:33 +01:00
Michael Niedermayer
e21235f9b9 avformat/mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd 
This also moves mov_rewrite_dvd_sub_extradata() to mov.c

Fixes: NeroRecodeSample.mp4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 18:36:25 +01:00
Michael Niedermayer
8ba432bc56 avformat/mov: fill in subtitle dimensions after parsing tkhd 
Sample: NeroRecodeSample.mp4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 18:21:11 +01:00
Michael Niedermayer
b6ad5893ce avformat/isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata() 
Fixes regression with NeroRecodeSample.mp4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 17:09:33 +01:00
Michael Niedermayer
f6f3c85c0e avformat/isom: Simplify mov_rewrite_dvd_sub_extradata() 
This avoids the 2nd buffer and fixes the palette truncated check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 17:06:30 +01:00
Michael Niedermayer
b1eb92a6bc Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libx264: check color_range

Conflicts:
	libavcodec/libx264.c

See: 48d39c8786
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 16:33:28 +01:00
Michael Niedermayer
34e325efa5 Merge commit 'bf0d7da7cbbf869605086c2a47cdf87f0a533e24' 
* commit 'bf0d7da7cbbf869605086c2a47cdf87f0a533e24':
  ljpeg: check color_range

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 16:23:01 +01:00
Michael Niedermayer
987b873049 Merge commit '2183432e6dc8aedf1ef3db63006a2a8195479abd' 
* commit '2183432e6dc8aedf1ef3db63006a2a8195479abd':
  mdec: set color_range

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 16:14:28 +01:00
Michael Niedermayer
020baa0be6 Merge commit '1c1fbc70cae44c10af8ff865826e31c17bc9f347' 
* commit '1c1fbc70cae44c10af8ff865826e31c17bc9f347':
  mjpeg: set color_range

Conflicts:
	libavcodec/mjpegdec.c

See: 2f870e262e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 16:12:25 +01:00
Michael Niedermayer
ca0e6fa731 Merge commit '6612a03d7470af4aa6b8aa313b1eff013691d181' 
* commit '6612a03d7470af4aa6b8aa313b1eff013691d181':
  fraps: set color_range

Conflicts:
	libavcodec/fraps.c

See: 79f452f4e6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 15:58:02 +01:00
Michael Niedermayer
1c79ca272d Merge commit '5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4' 
* commit '5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4':
  tiff: Support rgba encoding

Conflicts:
	libavcodec/tiffenc.c

See: d7fc100694
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 15:55:18 +01:00
Michael Niedermayer
ba7cdb970f Merge commit '6d78e852fbf3cab438a2085bcb64b90457c4a851' 
* commit '6d78e852fbf3cab438a2085bcb64b90457c4a851':
  img2: add j2c file extension

Conflicts:
	libavformat/img2enc.c

See: e8df18270a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 15:51:45 +01:00
Michael Niedermayer
c738ffcf2c Merge commit '58c215961a9067bb670387bbd72286c30de04b93' 
* commit '58c215961a9067bb670387bbd72286c30de04b93':
  raw, nut: Support rgba64 encoding

Conflicts:
	libavcodec/raw.c
	libavformat/nut.c

See: edf34c346e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 15:43:55 +01:00
Michael Niedermayer
3731c40989 Merge commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9' 
* commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9':
  png: Support rgb48 and rgba64 encoding

Conflicts:
	libavcodec/pngenc.c

See: f94ce3bcab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 15:33:17 +01:00
Michael Niedermayer
a00d4c5956 Merge commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186' 
* commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186':
  png: K&R formatting cosmetics

Conflicts:
	libavcodec/png.c
	libavcodec/pngdec.c
	libavcodec/pngenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 15:29:42 +01:00
Michael Niedermayer
b361a0bf1f Merge commit 'f7518f1a0e0a1788c303de3c6198da07e575710c' 
* commit 'f7518f1a0e0a1788c303de3c6198da07e575710c':
  codec_desc: update dvaudio tag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 14:53:05 +01:00
Michael Niedermayer
85d28a8656 Merge commit '6d7b22fb8f247a51e668c83b2f2460a9b3e948a8' 
* commit '6d7b22fb8f247a51e668c83b2f2460a9b3e948a8':
  isom: fix C99-style declaration

See: cd0982e189
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 14:50:53 +01:00
Michael Niedermayer
6b1ca1709f Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30' 
* commit '1481d24c3a0abf81e1d7a514547bd5305232be30':
  RGBA64 pixel formats

Conflicts:
	doc/APIchanges
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h
	libswscale/utils.c

See: 9569a3c9f4
See: 92afb43162, as well as others
Note: the enum values added in libav are incompatible/different to what ffmpeg used since 3 years
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 14:41:13 +01:00
Michael Niedermayer
ad9a6e19e1 Merge commit 'd24e9a99a40166bf881ccd2e3ae5688af4726658' 
* commit 'd24e9a99a40166bf881ccd2e3ae5688af4726658':
  h264 does not depend on mpegvideo any more

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 13:46:23 +01:00
Michael Niedermayer
3e3b0b3a40 avcodec/vdpau: update ff_vdpau_h264_set_reference_frames() to H264Picture 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 13:35:23 +01:00
Michael Niedermayer
dc226c023d Merge commit '7245a0ae872d4f65396a37d13f5d1d2c2efe11c2' 
* commit '7245a0ae872d4f65396a37d13f5d1d2c2efe11c2':
  mpegvideo: remove h264-only fields

Conflicts:
	libavcodec/mpegvideo.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 13:31:28 +01:00
Michael Niedermayer
329a3286d6 Merge commit 'be039278b5ebd8075d90a3508db2aed5adf59e02' 
* commit 'be039278b5ebd8075d90a3508db2aed5adf59e02':
  mpegvideo: move ff_draw_horiz_band() to mpegutils.c

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 13:23:48 +01:00
Michael Niedermayer
29be9b5301 avcodec/dxva2: fix pointers after H264Picture 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 13:22:40 +01:00
Michael Niedermayer
2a37e560dc avcodec/vdpau: fix ff_vdpau_get_surface_id() argument after H264Picture 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 13:05:13 +01:00
Michael Niedermayer
377cfc28a2 avcodec/vaapi: fix pointer types after H264Picture changes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 12:45:36 +01:00
Michael Niedermayer
9517900bef Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b' 
* commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b':
  mpegvideo: move mpegvideo formats-related defines to mpegutils.h

Conflicts:
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_mvpred.h
	libavcodec/svq1enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 12:36:48 +01:00
Michael Niedermayer
3e5833802e Merge commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d' 
* commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d':
  h264: Remove MotionEstContext and move the relevant fields to H264Context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 12:26:09 +01:00
Michael Niedermayer
bb3c0571d3 Merge commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c' 
* commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c':
  h264: Replace mpegvideo-specific MAX_THREADS by private define

Conflicts:
	libavcodec/h264.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 06:17:29 +01:00
Michael Niedermayer
a81a2b514e Merge commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27' 
* commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27':
  h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 06:05:19 +01:00
Michael Niedermayer
6102dda1d7 avcodec/h264: h264_set_erpic() clear destination 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 05:52:05 +01:00
Michael Niedermayer
c237e88d51 Merge commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87' 
* commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87':
  h264: move relevant fields from Picture to H264Picture

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 05:51:27 +01:00