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

59198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Biurrun
a1d7d55247 build: Do not add -g to HOSTCFLAGS 
The flag is not unconditionally added to CFLAGS either and the
programs built on the host do not get habitually fed to a debugger.
 2013-12-13 16:47:49 +01:00
Michael Niedermayer
1d0995e3a5 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Force one stream in caf muxer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-13 15:44:45 +01:00
Michael Niedermayer
47eb15b989 avfilter/vf_pullup: fix memleak on error 
Fixes CID1108604

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-13 15:14:03 +01:00
Michael Niedermayer
8f9569cfac avfilter/vf_pullup: Factor free_field_queue() out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-13 15:13:01 +01:00
Carl Eugen Hoyos
fb5518cfb7 Force one stream in caf muxer. 
Based on eeb975f5
 2013-12-13 11:57:39 +01:00
Clément Bœsch
b02d87936b examples/demuxing_decoding: print the decoding error when it happens. 2013-12-13 10:37:20 +01:00
Even Wiik Thomassen
43f116d162 examples/demuxing_decoding: return error when no codec found 
The open_codec_context function, when it fails to find a codec, now
return AVERROR(EINVAL) to signal an error.

Before it would return the stream index, which was always >= 0, and
continue as if a codec was found. This change make it fail faster,
instead of repeated failed tries to decode frames with no codec.

Signed-off-by: Even Wiik Thomassen <e.thomassen@sportradar.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-12-13 09:45:54 +01:00
Stefano Sabatini
65a3429e7a ffprobe: add cosmetical empty line 2013-12-13 09:42:15 +01:00
Stefano Sabatini
93f0882725 ffserver: improve error feedback in case of av_write_frame() error 2013-12-13 09:42:15 +01:00
Stefano Sabatini
bed4eeab33 MAINTAINERS: remove ffserver maintainership status notice 
Privately approved by Baptiste.
 2013-12-13 09:42:15 +01:00
Lou Logan
d546a59a81 docs/outdevs: add a few simple ALSA examples 2013-12-12 18:21:52 -09:00
Michael Niedermayer
5d8e4f6da0 avformat/rtpenc: check av_packet_get_side_data() return, fix null ptr dereference 
Fixes CID1035715

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-13 02:09:20 +01:00
Michael Niedermayer
c5f15f40b9 avformat/rtpdec_h264: fix null pointer dereferences 
Fixes CID733716

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-13 02:09:20 +01:00
Michael Niedermayer
db8a53d86a avformat/sdp: fix memleak on error 
Fixes CID700640
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-13 00:27:25 +01:00
Michael Niedermayer
180a0b1bcb avcodec/hevc_sei: fix use of uninitialized variables in decode_nal_sei_frame_packing_arrangement() 
Fixes CID1135773/1135774/1135775
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-13 00:07:06 +01:00
Michael Niedermayer
3dbf9afe85 libavformat/hdsenc: check init_file() return code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 21:04:24 +01:00
Michael Niedermayer
7830c882fa Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpegts: add HEVC registration descriptor

Conflicts:
	libavformat/mpegts.c

See: d0b7d24b80
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 20:23:58 +01:00
Michael Niedermayer
93cf43ec3f Merge commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c' 
* commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c':
  changelog: drop redundant new attribute

Conflicts:
	Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 19:55:06 +01:00
Michael Niedermayer
2644df82e6 Merge commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a' 
* commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a':
  img2: add stereo 3d still picture file extensions

Conflicts:
	libavformat/img2.c

See: 6fe12c7ff2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 19:48:36 +01:00
Michael Niedermayer
30aa9b727d Merge commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39' 
* commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39':
  rtsp: suppress a incompatible pointer types warning

Conflicts:
	libavformat/rtsp.c

See: 0079232299
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 19:37:46 +01:00
Michael Niedermayer
a435a03374 Merge commit '6b45f05ef5b241fd1513702119af9c30056a0ac5' 
* commit '6b45f05ef5b241fd1513702119af9c30056a0ac5':
  parseutils: fix discarding const attribute warning

Conflicts:
	libavutil/parseutils.c

See: fe87b2e79c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 19:12:33 +01:00
Michael Niedermayer
d780fdb904 avformat/hlsenc: copy metadata 
Fixes Ticket2296

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 18:41:39 +01:00
James Almer
c619e14c31 avformat/oggparseopus: Check opus_duration() return value 
Regression since 39d11d599c

os->pduration would be wrongly assigned a negative value on invalid packets
instead of aborting.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 17:26:19 +01:00
Carl Eugen Hoyos
9fa75be96d mpegts: add HEVC registration descriptor 2013-12-12 16:10:15 +01:00
Vittorio Giovara
a2eeed619d changelog: drop redundant new attribute 2013-12-12 16:10:15 +01:00
Martin Lambers
ae9d13f03e img2: add stereo 3d still picture file extensions 2013-12-12 16:10:15 +01:00
Vittorio Giovara
46c0cbd5dc rtsp: suppress a incompatible pointer types warning 2013-12-12 16:10:14 +01:00
Vittorio Giovara
6b45f05ef5 parseutils: fix discarding const attribute warning 2013-12-12 16:10:14 +01:00
Michael Niedermayer
30ee4b3393 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mp3adu: Set the channel layout properly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 13:02:20 +01:00
Martin Storsjö
35686a289f mp3adu: Set the channel layout properly 
This fixes decoding, broken since 7e35037.

This is similar to what was done for the normal mp3 decoder in
f4a86bc9.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-12-12 10:18:25 +02:00
Michael Niedermayer
551a679795 avformat/oggdec: reset end_trimming when it has been used, so it cannot be used twice by mistake 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 05:33:21 +01:00
Dale Curtis
9c0dd7b462 avformat/oggdec: reset end_trimming in ogg_reset() 
Fixes the output when seeking back to the start

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 05:33:02 +01:00
Michael Niedermayer
3efe5e3b09 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtspdec: Fix keep-alive request for ACTi cameras

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 00:41:02 +01:00
Michael Niedermayer
44967ab60a Merge commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671' 
* commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671':
  lavc: deprecate avcodec_get_frame_defaults().

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 00:32:15 +01:00
Michael Niedermayer
e3578fd525 Merge commit '598ce4ab4f1893e0661fc038101487e511937877' 
* commit '598ce4ab4f1893e0661fc038101487e511937877':
  h264: call av_frame_unref() instead of avcodec_get_frame_defaults().

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 00:25:31 +01:00
Michael Niedermayer
525a7d9b78 Merge commit '48d17ee6dc2b2a552f645484f200c2946bf24607' 
* commit '48d17ee6dc2b2a552f645484f200c2946bf24607':
  api-example: remove an unneeded call to avcodec_get_frame_defaults().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 00:19:53 +01:00
Michael Niedermayer
0506cc2cc3 Merge commit '281a40e18f923510f2067d05c5b0cf08cc49dfee' 
* commit '281a40e18f923510f2067d05c5b0cf08cc49dfee':
  lavf: remove an unneeded call to avcodec_get_frame_defaults().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 00:14:21 +01:00
Michael Niedermayer
3b2b07397c Merge commit '2d1f4288dd02a624cb8b86ab06371d6434c9da69' 
* commit '2d1f4288dd02a624cb8b86ab06371d6434c9da69':
  mpegvideo: call av_frame_unref() instead of avcodec_get_frame_defaults().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 00:08:08 +01:00
Michael Niedermayer
efb5ebe832 Merge commit 'b06c8bce02b15115a4789252365df2dda0c4713c' 
* commit 'b06c8bce02b15115a4789252365df2dda0c4713c':
  mpegvideo: remove an unneeded call to avcodec_get_frame_defaults().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 23:55:51 +01:00
Michael Niedermayer
5a15bd6f2f Merge commit '84f131921ffb43d8070d5680e91f6a24d66ccac4' 
* commit '84f131921ffb43d8070d5680e91f6a24d66ccac4':
  avplay: do not call avcodec_get_frame_defaults().

Conflicts:
	ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 23:49:44 +01:00
Michael Niedermayer
27e7977982 Merge commit '95a8a5aca60ce37d3abdf121a0285c2e317cf521' 
* commit '95a8a5aca60ce37d3abdf121a0285c2e317cf521':
  lavc: call av_frame_unref() instead of avcodec_get_frame_defaults().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 23:41:27 +01:00
Michael Niedermayer
e22e943ef9 Merge commit '674fa49110a661694188a958be13d529b7c8c5dd' 
* commit '674fa49110a661694188a958be13d529b7c8c5dd':
  avconv: do not call avcodec_get_frame_defaults()

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 23:36:10 +01:00
Michael Niedermayer
409a143e4b Merge commit '943135621830ac3857d3cf766cfc280a95bb3c13' 
* commit '943135621830ac3857d3cf766cfc280a95bb3c13':
  lavc: deprecate avcodec_free_frame()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 23:24:48 +01:00
Michael Niedermayer
4cbf3eb9e6 Merge commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9' 
* commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9':
  Replace all uses of avcodec_free_frame with av_frame_free().

Conflicts:
	doc/examples/decoding_encoding.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 23:18:51 +01:00
Michael Niedermayer
dee6d5f51c Merge commit '17a10d51b8351ce9a57fcb6537b6a3c6ec8ba5e9' 
* commit '17a10d51b8351ce9a57fcb6537b6a3c6ec8ba5e9':
  hevc: set time_base when possible

See: f90281ca97
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 23:16:09 +01:00
Michael Niedermayer
12a4042445 Merge commit '33452aede6acab78f726cd1924824585f00765cc' 
* commit '33452aede6acab78f726cd1924824585f00765cc':
  hevc: store the VPS list as an AVBufferRef, just like the others *PS

Conflicts:
	libavcodec/hevc.c
	libavcodec/hevc_ps.c

See: 36658c978f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 23:08:45 +01:00
Michael Niedermayer
1dbb3cfa17 Merge commit 'b769cf4b44c8112827c2fdfcab74bd95600fd6d3' 
* commit 'b769cf4b44c8112827c2fdfcab74bd95600fd6d3':
  hevc: do not dereference pointer before NULL check in verify_md5()

See: f2eca8d060
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 23:03:01 +01:00
Michael Niedermayer
95ad2483c3 Merge commit '3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26' 
* commit '3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26':
  configure: Add -D__USE_MINGW_ANSI_STDIO=1 to CPPFLAGS on MinGW64

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 22:52:28 +01:00
Michael Niedermayer
37437d97a8 tools/probetest: Check av_realloc() return code 
Fixess CID1135761
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 22:29:22 +01:00
Michael Niedermayer
f6173fed60 postproc: fix null pointer dereference with invalid option strings 
Fixes CID1135760
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 22:28:42 +01:00