generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
51,157 Commits 24 Branches 241 Tags
Commit Graph

12533 Commits

Author SHA1 Message Date
Michael Niedermayer
06a8350599 Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292' 
* commit '7b486ab13bfcfa88a7cd92586de50e49966ec292':
  lavf: remove disabled FF_API_AV_GETTIME cruft
  lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft

Conflicts:
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 12:37:03 +01:00
Michael Niedermayer
256e1f7bdf Merge commit '435c2a31ad5eead20eda1152097f60c3bfa22847' 
* commit '435c2a31ad5eead20eda1152097f60c3bfa22847':
  lavf: remove disabled FF_API_READ_PACKET cruft

Conflicts:
	libavformat/version.h

Removial postponed as wraper is trivial

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 12:34:06 +01:00
Michael Niedermayer
1c60956c80 Merge commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201' 
* commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201':
  lavf: remove disabled FF_API_APPLEHTTP_PROTO cruft

Conflicts:
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 12:21:43 +01:00
Michael Niedermayer
ed80427e0e Merge commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6' 
* commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6':
  lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruft

Conflicts:
	libavformat/version.h

removial postponed as the wraper code is trivial

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 12:18:06 +01:00
Hendrik Leppkes
713ac21097 avutil/os_support: use 64-bit fstat/lseek variants for MSVC as well 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 20:06:31 +01:00
Luca Barbato
37cb3b180a matroskadec: request a read buffer for the wav header 
Solve an infiniloop.

CC: libav-stable@libav.org
 2013-03-12 18:58:06 +01:00
Nicolas George
b52421940f lavf: add AV_ to two remaining CODEC_ID_*. 2013-03-12 16:21:22 +01:00
Michael Niedermayer
b36095ea0f Merge commit '3e2f200237af977b9253b0aff121eee27bcedb44' 
* commit '3e2f200237af977b9253b0aff121eee27bcedb44':
  roqvideodec: fix a potential infinite loop in roqvideo_decode_frame().
  xxan: fix invalid memory access in xan_decode_frame_type0()
  tty: set avg_frame_rate.
  FATE: enable multiple slices in the ffv1 vsynth test

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 15:57:28 +01:00
Michael Niedermayer
0cfbfaaa12 Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241' 
* commit '7b89cd20d844cbe763ca34e63e99d110043cf241':
  eamad: allocate a dummy reference frame when the real one is missing
  Replace remaining includes of audioconvert.h with channel_layout.h
  Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 15:44:15 +01:00
Michael Niedermayer
a75f01d7e0 Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111' 
* commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111':
  Add the bumps and APIchanges entries for reference counted buffers changes.

Conflicts:
	Changelog
	doc/APIchanges
	libavcodec/version.h
	libavdevice/version.h
	libavfilter/version.h
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 15:35:39 +01:00
Michael Niedermayer
c292e340ed avformat: keep r_frame_rate 
This field is used and nothing equivalent exists

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 15:28:23 +01:00
Michael Niedermayer
9cf788eca8 avformat/avdevice: add missing time.h includes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 15:28:22 +01:00
Diego Biurrun
a4472ac01e Add informative messages to av_log_ask_for_sample calls lacking them 2013-03-12 11:09:45 +01:00
Diego Biurrun
8f10f1a6dc anm: Get rid of some very silly goto statements 2013-03-12 11:05:28 +01:00
Anton Khirnov
85a5bc054c lavf: remove disabled FF_API_R_FRAME_RATE cruft 2013-03-11 18:23:50 +01:00
Anton Khirnov
7b486ab13b lavf: remove disabled FF_API_AV_GETTIME cruft 2013-03-11 18:23:18 +01:00
Anton Khirnov
32e5194969 lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft 2013-03-11 18:23:10 +01:00
Anton Khirnov
435c2a31ad lavf: remove disabled FF_API_READ_PACKET cruft 2013-03-11 18:23:02 +01:00
Anton Khirnov
c7e044c61b lavf: remove disabled FF_API_APPLEHTTP_PROTO cruft 2013-03-11 18:22:54 +01:00
Anton Khirnov
0a7c4daf46 lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruft 2013-03-11 18:22:45 +01:00
Michael Niedermayer
806a66fd08 mpegts: clear avprograms only for removed programs 
Fixes Ticket2186

Requested-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-10 02:28:05 +01:00
Michael Niedermayer
2653e12520 Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 
* commit '1afddbe59e96af75f1c07605afc95615569f388f':
  avpacket: use AVBuffer to allow refcounting the packets.

Conflicts:
	libavcodec/avpacket.c
	libavcodec/utils.c
	libavdevice/v4l2.c
	libavformat/avidec.c
	libavformat/flacdec.c
	libavformat/id3v2.c
	libavformat/matroskaenc.c
	libavformat/mux.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 19:12:03 +01:00
Martin Storsjö
f1af3d19a7 output-example: Update to use encode_video2 instead of the now dropped encode_video 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-03-08 13:42:45 +01:00
Anton Khirnov
6c7d339afc tty: set avg_frame_rate. 
The container does not store any timestamps and is CFR-only.
 2013-03-08 08:11:05 +01:00
Anton Khirnov
0651e892e1 Replace remaining includes of audioconvert.h with channel_layout.h 2013-03-08 07:42:13 +01:00
Anton Khirnov
d8b31be6ca Add the bumps and APIchanges entries for reference counted buffers changes. 2013-03-08 07:41:49 +01:00
Anton Khirnov
1afddbe59e avpacket: use AVBuffer to allow refcounting the packets. 
This will allow us to avoid copying the packets in many cases.

This breaks ABI.
 2013-03-08 07:33:45 +01:00
Alexander Kojevnikov
eae0879d96 mp3dec: Fix VBR bit rate parsing 
When parsing the Xing/Info tag, don't set the bit rate if it's an Info tag.

When parsing the stream, don't override the bit rate if it's already set,
otherwise calculate the mean bit rate from parsed frames. This way, the bit
rate will be set correctly both for CBR and VBR streams.

CC:libav-stable@libav.org

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-03-08 07:32:11 +01:00
Reimar Döffinger
efa7f42020 Use the avstring.h locale-independent character type functions 
Make sure the behavior does not change with the locale.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-07 15:16:36 +02:00
Michael Niedermayer
cada996528 avformat: Fix apics with aac 
Fixes Ticket2318

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-07 13:55:43 +01:00
Michael Niedermayer
a12a618aa9 hls: fix timebase 
Fixes Ticket1733

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-07 13:42:12 +01:00
Stefano Sabatini
d95143ec82 lavf/segment: add support to ffconcat segment list 2013-03-07 01:44:59 +01:00
Michael Niedermayer
d929364814 asfdec: dont truncate type 2-5 values 
Fixes use of uninitialized variables and possible out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-05 22:29:57 +01:00
Nicolas George
c31458c334 lavf/concat: compute duration if possible. 2013-03-05 16:44:51 +01:00
Nicolas George
3ab25e4574 Revert "lavf/concatdec: define "ffcat" and "ffconcat" extensions" 
This reverts commit 6cc12353a88dfb21c4c5a38e6c83280483b0ec88.

Conflicts:
	libavformat/version.h

Allowing to automatically select the concat demuxer raises
security concerns, as it allows a possibly hostile file to
access any file on the system. Guessing the format based on
the file name extension does not allow to enable the safe
mode designed to avoid it.
 2013-03-05 14:10:10 +01:00
Alexander Kojevnikov
29d8cd265a mp3dec: Fix VBR bit rate parsing 
When parsing the Xing/Info tag, don't set the bit rate if it's an Info tag.

When parsing the stream, don't override the bit rate if it's already set,
otherwise calculate the mean bit rate from parsed frames. This way, the bit
rate will be set correctly both for CBR and VBR streams.

Signed-off-by: Alexander Kojevnikov <alexander@kojevnikov.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-05 13:06:01 +01:00
Michael Niedermayer
3dbc0ff9c3 iff: fix integer overflow 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-05 01:39:50 +01:00
Michael Niedermayer
7992bdbeb4 update_stream_timings: check bitrate for being in range. 
Fixes numerical overflow
Fixes Ticket2089

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-04 18:54:00 +01:00
Michael Niedermayer
faa0068a87 avformat: Make duration estimation from pts more robust 
Ignore durations which differ significantly from the previous
Fixes Ticket2018

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-04 18:01:32 +01:00
Michael Niedermayer
9bb54bb685 nutdec: more specific return codes for decode_syncpoint() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-04 16:51:21 +01:00
Michael Niedermayer
7ccc0ed6a0 nutdec: print error on invalid/unsupported fourcc style 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-04 16:49:17 +01:00
Michael Niedermayer
144da7eeca Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  buildsys: only include log2_tab per library for shared builds
  Add h264chroma dependency for cavs decoder to configure.
  Add h264qpel dependency for snow codec to configure.
  Add h264chroma dependency for vp5 and vp6 decoder to configure.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-04 14:45:52 +01:00
Michael Niedermayer
03148fd174 buildsys: only include log2_tab per library for shared builds 
Fix linking failures with -all_load due to multiple log2_tabs

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2013-03-04 12:25:02 +01:00
Reimar Döffinger
88d55b827d Remove incorrect use of ctype.h functions. 
As far as I can tell the code should not change behaviour
depending on locale in any of these places.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-03-03 21:44:10 +01:00
Michael Niedermayer
f2cb993139 avformat: gather aspect ratio from rv30/40 in find_stream_info 
Fixes Ticket1550

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 18:41:16 +01:00
Michael Niedermayer
3fac99cd9d Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  movenc: Do not flag secondary audio and subtitle tracks as enabled.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 14:05:09 +01:00
Michael Niedermayer
981cf0c300 movenc: Do not flag secondary audio and subtitle tracks as enabled. 
Fixes ticket #468 and ticket #1174.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2013-03-03 12:09:38 +01:00
Michael Niedermayer
fd464d4d01 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtpdec: Initialize some variables to silence compiler warnings

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 11:40:37 +01:00
Martin Storsjö
8fbab7a6c8 rtpdec: Initialize some variables to silence compiler warnings 
The warnings are false positives, older gcc versions (such as 4.5)
think the variables can be used uninitialized while they in
practice can't, while newer (4.6) gets it right.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-02 21:23:52 +02:00
Carl Eugen Hoyos
6091a8d92d Avoid huge memory allocations from asf demuxer. 
Fixes ticket #1888.
 2013-03-02 18:37:55 +01:00