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

67450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
1a1a98f644 avutil/ppc/util_altivec: make src pointers const, fix warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-07 14:42:17 +01:00
Rong Yan
79e0255956 libavcodec/ppc/hpeldsp_altivec.c : fix ff_put_pixels16_altivec() put_no_rnd_pixels16_xy2_altivec() put_no_rnd_pixels8_xy2_altivec() avg_pixels8_altivec() avg_pixels8_xy2_altivec() put_pixels16_xy2_altivec() put_pixels8_xy2_altivec() ff_avg_pixels16_altivec() for POWER LE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-07 12:32:03 +01:00
Rong Yan
6a6c16cbcc libavutil/ppc/util_altivec.h : fix unaligned_load() vec_unaligned_load() add macros VEC_LD() VEC_MERGEH() VEC_MERGEL() VEC_ST() for POWER LE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-07 10:51:35 +01:00
Michael Niedermayer
c11f731768 avformat/webpenc: preserve single image VP8X flags 
Fixes Ticket4087

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-07 04:15:01 +01:00
Michael Niedermayer
b1c99f4c5f avcodec/aacdec: Add table of profile names 
based on tables of aac encoders from libavcodec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-07 03:09:50 +01:00
Michael Niedermayer
2daae445c0 avcodec/aacdec: print extension type when startcode debugging is on 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-07 03:09:50 +01:00
James Almer
b385c4c6a3 x86/swr: replace sse4 instructions in pack_6ch with sse ones 
There's no benefit from using blendps here except on CPUs with AVX, where
it's faster than shufps according to Intel's documentation.
As such, rename the sse4 functions to sse/sse2 and use shufps instead.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-11-06 20:54:00 -03:00
Thilo Borgmann
93ab6693d8 lavd/avfoundation: Update documentation to mention audio capabilities. 
Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 23:30:19 +01:00
Michael Niedermayer
c53a1507aa Merge commit '199d9f995da53fe2507821f6d96bbc692574e1a9' 
* commit '199d9f995da53fe2507821f6d96bbc692574e1a9':
  mjpegdec: fix undefined shift

Conflicts:
	libavcodec/mjpegdec.c

See: b432960528
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 18:28:49 +01:00
Michael Niedermayer
ad0cf8e063 Merge commit 'ac4a5e3abd8a022ab32245ad527ffc37eabab8b1' 
* commit 'ac4a5e3abd8a022ab32245ad527ffc37eabab8b1':
  pthreads_frame: Do not leak on failure path

See: 11679e1b90
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 18:17:33 +01:00
Michael Niedermayer
f663734738 Merge commit '5d29efe4b0154ce305d66fed2ac23e5842439256' 
* commit '5d29efe4b0154ce305d66fed2ac23e5842439256':
  mpeg12dec: simplify context duplication

Not merged, theres no point in copying data and afterwards zeroing it
Also zeroing is not correct on its own

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 18:15:40 +01:00
Michael Niedermayer
98d6f0ffef Merge commit '37b3361e755361d4ff14a2973df001c0140d98d6' 
* commit '37b3361e755361d4ff14a2973df001c0140d98d6':
  mpeg12enc: factor out check in encode_dc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 17:28:40 +01:00
Michael Niedermayer
c96a44d0dd Merge commit '0a6664706168dc1049967bec311970d720581625' 
* commit '0a6664706168dc1049967bec311970d720581625':
  mpegvideo_enc: factor out denominator and explicitly cast operands

Conflicts:
	libavcodec/mpegvideo_enc.c

See: c753b56b4d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 17:21:36 +01:00
Michael Niedermayer
5241f90058 Merge commit 'e0a1d0a2b04eb5220d00fc7ce46a57cc5e3c7118' 
* commit 'e0a1d0a2b04eb5220d00fc7ce46a57cc5e3c7118':
  mpegvideo_enc: rework direct mode check

Conflicts:
	libavcodec/mpegvideo_enc.c

See: ad98567198
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 17:14:38 +01:00
Vittorio Giovara
199d9f995d mjpegdec: fix undefined shift 
Add a comment to explain the code.

CC: libav-stable@libav.org
Bug-Id: CID 1194388
 2014-11-06 10:44:46 -05:00
Luca Barbato
ac4a5e3abd pthreads_frame: Do not leak on failure path 
CC: libav-stable@libav.org
Bug-Id: CID 1135767
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-11-06 10:44:46 -05:00
Vittorio Giovara
5d29efe4b0 mpeg12dec: simplify context duplication 
CC: libav-stable@libav.org
Bug-Id: CID 717453 / CID 717454 / CID 717915
 2014-11-06 10:44:46 -05:00
Vittorio Giovara
37b3361e75 mpeg12enc: factor out check in encode_dc 
Makes coverity less confused and the code more readable.

CC: libav-stable@libav.org
Bug-Id: CID 751744
 2014-11-06 10:44:46 -05:00
Vittorio Giovara
0a66647061 mpegvideo_enc: factor out denominator and explicitly cast operands 
CC: libav-stable@libav.org
Bug-Id: CID 608053
 2014-11-06 10:44:46 -05:00
Vittorio Giovara
e0a1d0a2b0 mpegvideo_enc: rework direct mode check 
Remove stray semicolon and share codepaths.

CC: libav-stable@libav.org
Bug-Id: CID 991857
 2014-11-06 10:44:46 -05:00
Michael Niedermayer
d70e503ebc avfilter/af_aresample: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 15:58:28 +01:00
Giorgio Vazzana
be0356ca05 lavd/v4l2: use pixel format variable names consistently 
We now use 'pixelformat' for V4L2_PIX_FMT_* (as they do in v4l2
documentation) and 'pix_fmt' for AVPixelFormat.

No functional change in the code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 15:39:41 +01:00
Michael Niedermayer
8afaa03c53 avformat/riffenc: move MP3 LSF threshold to the midway point between the 2 
No testcase available but this seems more correct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 14:53:21 +01:00
Michael Niedermayer
d5999b7f28 avformat/yuv4mpegenc: Use AVFormatContext strict_std_compliance instead of AVCodecContext 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 14:48:50 +01:00
Michael Niedermayer
da8cb1c361 avformat/mmf: Use AVFormatContext strict_std_compliance instead of AVCodecContext 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 14:48:41 +01:00
Michael Niedermayer
470e116e3f avformat/flvenc: Use AVFormatContext strict_std_compliance instead of AVCodecContext 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 14:47:43 +01:00
Michael Niedermayer
e591608753 avcodec/xiph: make extradata argument const 
Fixes "warning: passing argument 1 of avpriv_split_xiph_headers discards const qualifier from pointer target type"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 14:41:38 +01:00
Michael Niedermayer
0de64082a9 Merge commit '05e59135b3539062465b5005b6d46ec0418a5fc4' 
* commit '05e59135b3539062465b5005b6d46ec0418a5fc4':
  nutdec: do not set has_b_frames

Not merged, this change is not correct

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 14:32:43 +01:00
Michael Niedermayer
cffd2713e9 Merge commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48' 
* commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48':
  lavc: make avpriv_flac_is_extradata_valid() private on the next bump

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 14:17:46 +01:00
Michael Niedermayer
94fe404c25 Merge commit 'e839de0f851535b5e19256b52f9865f0cb768a7c' 
* commit 'e839de0f851535b5e19256b52f9865f0cb768a7c':
  oggenc: accept only STREAMINFO extradata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 14:09:53 +01:00
Michael Niedermayer
cfef947f7f Merge commit 'c070a8751597e3aa1b443e88464da785d8966b14' 
* commit 'c070a8751597e3aa1b443e88464da785d8966b14':
  lavc: make avpriv_flac_parse_streaminfo() private on the next bump

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 13:54:11 +01:00
Michael Niedermayer
b6a9956396 Merge commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c' 
* commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c':
  lavf: stop using avpriv_flac_parse_streaminfo()

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 13:42:41 +01:00
Michael Niedermayer
a51eb6d34c Merge commit '56dc46a1893251e74be1ad63e54fb38d754bb1fe' 
* commit '56dc46a1893251e74be1ad63e54fb38d754bb1fe':
  riffenc: do not fall back on AVCodecContext.frame_size for MP3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 13:19:26 +01:00
Michael Niedermayer
042eba52a5 Merge commit '91e8d2eb1f7bf3af949008b106ec1ca037b88b0e' 
* commit '91e8d2eb1f7bf3af949008b106ec1ca037b88b0e':
  lavf: use the format context strict_std_compliance instead of the codec one

Conflicts:
	libavformat/mux.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 13:10:01 +01:00
Michael Niedermayer
c04c43b3e4 avformat/oggparsevorbis: Check that initialization succeeded before declaring the end of headers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 13:02:08 +01:00
Michael Niedermayer
4b2763cd13 avformat/oggparsevorbis: return proper error code from vorbis_header() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 13:01:06 +01:00
Michael Niedermayer
f74be3669d Merge commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959' 
* commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959':
  lavc,lavf: switch to the new vorbis parse API

Conflicts:
	libavformat/oggparsevorbis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 12:05:17 +01:00
Michael Niedermayer
7ffdc7bef2 avcodec/export av_vorbis_parse_frame_flags() 
The other functions where changed in the previous merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 11:58:32 +01:00
Michael Niedermayer
44fa2671e0 Merge commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70' 
* commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70':
  lavc: add a public API for parsing vorbis packets.

Conflicts:
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/version.h
	libavcodec/vorbis_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 11:21:47 +01:00
Michael Niedermayer
5f7887ca8d Merge commit '6896f95b2483e52e717e2c75a4fd24fcb0e14b67' 
* commit '6896f95b2483e52e717e2c75a4fd24fcb0e14b67':
  vorbis_parser: add an AV prefix to VorbisParseContext

Conflicts:
	libavcodec/vorbis_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 11:06:19 +01:00
Michael Niedermayer
a0617025dd Merge commit '8747926' 
* commit '8747926':
  vorbis_parser: use a dedicated AVClass for logging

Conflicts:
	libavcodec/vorbis_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-06 10:50:59 +01:00
Anton Khirnov
05e59135b3 nutdec: do not set has_b_frames 
It is not supposed to be set by demuxers.
 2014-11-06 09:05:37 +01:00
Anton Khirnov
acc897e6b1 lavc: make avpriv_flac_is_extradata_valid() private on the next bump 2014-11-06 09:04:56 +01:00
Anton Khirnov
e839de0f85 oggenc: accept only STREAMINFO extradata 
The reasoning is the same as for
0097cbea69.
 2014-11-06 09:04:32 +01:00
Anton Khirnov
c070a87515 lavc: make avpriv_flac_parse_streaminfo() private on the next bump 2014-11-06 09:04:12 +01:00
Anton Khirnov
7784f47762 lavf: stop using avpriv_flac_parse_streaminfo() 
The only parameters needed by the demuxers are the sample rate and sample
count, which can be trivially extracted manually, without resorting to
an avpriv function.
 2014-11-06 09:02:25 +01:00
Anton Khirnov
56dc46a189 riffenc: do not fall back on AVCodecContext.frame_size for MP3 
It will not be set unless the codec context is used as the encoding
context, which is discouraged. For MP2, av_get_audio_frame_duration()
will already set the frame size properly. For MP3, set the frame size
explicitly.
 2014-11-06 09:02:08 +01:00
Anton Khirnov
91e8d2eb1f lavf: use the format context strict_std_compliance instead of the codec one 2014-11-06 09:01:49 +01:00
Anton Khirnov
2f3fadfbe3 lavc,lavf: switch to the new vorbis parse API 2014-11-06 09:00:46 +01:00
Anton Khirnov
5e80fb7ff2 lavc: add a public API for parsing vorbis packets. 
It is required by (at least) the ogg demuxer.

Mark the current semi-public apriv API for removal.
 2014-11-06 08:51:25 +01:00