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

16612 Commits

Author SHA1 Message Date
Michael Niedermayer
47795505ac avformat/mov: rewrite aspect from matrix code 
The original code was intended purely for rotation == 0
In cf70ba37ba74089a18295b29e77dead0a3222c9e the condition was
changed to use it only for rotation != 0
which broke the cases for which it was intended to be used
as well as breaking cases for which it was not intended to be
used.
This changes the code so it could work for the more general
case and fixes the regressions
If you have sample files that are not handled correctly
please open tickets or mail me!

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 04:22:00 +01:00
Michael Niedermayer
89b6382bec Merge commit 'cf70ba37ba74089a18295b29e77dead0a3222c9e' 
* commit 'cf70ba37ba74089a18295b29e77dead0a3222c9e':
  mov: Check angle rather than full matrix when updating SAR

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 04:00:51 +01:00
Vittorio Giovara
cf70ba37ba mov: Check angle rather than full matrix when updating SAR 
When the display matrix is not the identity one, but the rotation angle
is zero, there is no need to update the sample aspect ratio.

Otherwise, it is possible to obtain negative values which interferes
with transcoding in later stages. This kind of behaviour is reproducible
on mov files with "major_brand: MSNV".

CC: libav-stable@libav.org
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-01-14 17:17:23 +01:00
Vittorio Giovara
456ffec35d img2dec: correctly use the parsed value from -start_number 
Previously the image sequence was always starting from the minimum
number rather than the requested one.

CC: libav-stable@libav.org
 2015-01-14 17:10:01 +01:00
Hendrik Leppkes
a9d700f212 mpegts: identify h264 mvc streams 
This fixes missdetecting such streams as something else like AAC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-14 01:39:16 +01:00
Michael Niedermayer
f2e12f8942 avformat/smoothstreamingenc: Add missing "goto fail" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-14 00:17:52 +01:00
Michael Niedermayer
8d7d88135c avformat/mpeg: Avoid dead assignment 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-14 00:06:43 +01:00
Mark Reid
b23a866844 libavformat/mxfdec.c: export the full UMID as metadata 
Previous version reviewed-by: tim nicholson

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-13 01:16:39 +01:00
Mark Reid
b08b5f4be2 libavformat/mxfdec.c: read project_name metadata 
MXF files generated by Media Composer or LibMXF can contain a
project name property in the Preface. Lots of existing samples have them.

http://samples.ffmpeg.org/MXF/issue2160/PW0805A0V01.4C5B5636.EFA330.mxf
project_name    : DNX145 PW Test

http://samples.ffmpeg.org/ffmpeg-bugs/trac/ticket3450/WriteAvidMXFgenerated/5502_0010_v1.mxf
project_name    : Rombus

http://samples.ffmpeg.org/ffmpeg-bugs/trac/ticket3100/1sec_mxf_test_Video5270C795.mxf
project_name    : NVB_DOOD

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-12 20:26:58 +01:00
Carl Eugen Hoyos
a5334d4081 Handle r10k endianess atom DpxE. 
Fixes playback and remuxing of r10k_full-range_big-endian.mov.

Reported, analyzed and tested by Olaf Matthes, olaf matthes gmx de
 2015-01-11 12:15:03 +01:00
Michael Niedermayer
aa6545e1f3 avformat/hlsenc: more robust error tests 
errors are negative throughout ffmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-11 05:17:44 +01:00
Michael Niedermayer
c8f83a4c78 avformat/voc: add seeking support 
Fixes Ticket1333

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-11 00:35:01 +01:00
Michael Niedermayer
6f838dee3c avformat/movenc: move variable to a more local block 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-10 04:50:50 +01:00
Michael Niedermayer
7824dc5150 avformat/movenc: workaround bug in "PathScale EKOPath(tm) Compiler Suite Version 4.0.12.1" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-10 03:43:54 +01:00
wm4
aab74a38b8 rm: fix memory leak on init failure 
AVInputFormat.read_close is not called if AVInputFormat.read_header
fails, so this needs to be handled separately.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-10 00:26:43 +01:00
Michael Niedermayer
f95cd5a235 Merge commit '51da7d02748cc54b7d009115e76efa940b99a8ef' 
* commit '51da7d02748cc54b7d009115e76efa940b99a8ef':
  matroskaenc: refuse to write AAC without valid extradata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-09 21:25:49 +01:00
Michael Niedermayer
b1d223301f avformat/hdsenc: Remove redundant NULL pointer checks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-09 15:55:07 +01:00
Anton Khirnov
51da7d0274 matroskaenc: refuse to write AAC without valid extradata 2015-01-09 15:51:00 +01:00
Michael Niedermayer
ef3a6a48b5 avformat/tee: Simplify code by using avio_closep() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-09 13:40:09 +01:00
Michael Niedermayer
643dee846a avformat/sapenc: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-09 13:39:48 +01:00
Michael Niedermayer
2959a61232 avformat/utils: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-09 13:39:06 +01:00
Peter Ross
6243845036 avformat/aiffdec: improve readability 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-09 00:50:45 +01:00
Carl Eugen Hoyos
cd3405282c Skip Exif data when auto-detecting jpeg images. 2015-01-09 00:30:02 +01:00
Michael Niedermayer
d1d8f866b5 avformat/mlvdec: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 20:19:20 +01:00
Michael Niedermayer
edeaf6f3a4 avformat/mlvdec: Simplify code by using avio_closep() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 20:19:20 +01:00
Michael Niedermayer
07e4ed5637 avformat/mov: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 20:19:20 +01:00
Michael Niedermayer
f9ddaa35c7 avformat/rtpenc_chain: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 20:19:20 +01:00
Michael Niedermayer
e360d030b3 avformat/rtsp: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 20:19:20 +01:00
Michael Niedermayer
bf3126db6a avformat/hlsenc: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 14:51:04 +01:00
Michael Niedermayer
26c72d2941 avformat/img2dec: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 14:50:34 +01:00
Michael Niedermayer
50bb9b87ab avformat/img2enc: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 14:50:07 +01:00
Michael Niedermayer
b565fd4464 avformat/hdsenc: Simplify code by using avio_closep() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 14:13:36 +01:00
Michael Niedermayer
0e1bb03cb0 Merge commit '01168bf1405ddbf671f1074a927b951b8777adbb' 
* commit '01168bf1405ddbf671f1074a927b951b8777adbb':
  mpeg: Remove unused field

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 22:48:24 +01:00
Michael Niedermayer
e2404096b0 avformat/segment: Clear contexts after deallocation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 22:29:16 +01:00
Michael Niedermayer
2a741baeff Merge commit 'b3f04657368a32a9903406395f865e230b1de348' 
* commit 'b3f04657368a32a9903406395f865e230b1de348':
  segment: Fix the failure paths

Conflicts:
	libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 22:15:45 +01:00
Michael Niedermayer
dfffc4aadc avformat/dvbsub: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 17:21:31 +01:00
Luca Barbato
01168bf140 mpeg: Remove unused field 2015-01-07 13:49:10 +01:00
Luca Barbato
b3f0465736 segment: Fix the failure paths 
A failure in segment_end() or segment_start() would lead to freeing
a dangling pointer and in general further calls to seg_write_packet()
or to seg_write_trailer() would have the same faulty behaviour.

CC: libav-stable@libav.org
Reported-By: luodalongde@gmail.com
 2015-01-07 12:36:28 +01:00
Michael Niedermayer
cb03d29dec Merge commit '2a1500fb552364488cfbee3e29e296788a3a6bdd' 
* commit '2a1500fb552364488cfbee3e29e296788a3a6bdd':
  movenc: Fix a typo in a comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 00:46:47 +01:00
Michael Niedermayer
0d0a905152 Merge commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f' 
* commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f':
  movenc: Readd an accidentally removed condition

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 00:39:44 +01:00
Michael Niedermayer
4009ee3ecc Merge commit '8e03ca2fff40ce065ea5a516200e777c96cd785e' 
* commit '8e03ca2fff40ce065ea5a516200e777c96cd785e':
  isom: add 'mp1v' fourcc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 00:31:05 +01:00
Martin Storsjö
2a1500fb55 movenc: Fix a typo in a comment 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-01-06 19:47:18 +02:00
Martin Storsjö
e581e88cbd movenc: Readd an accidentally removed condition 
This was removed accidentally as part of 847bf598. This could cause
groundless warning logging.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-01-06 19:47:09 +02:00
Justin Ruggles
8e03ca2fff isom: add 'mp1v' fourcc 
As referenced in the CoreMedia API docs.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-01-06 17:05:53 +01:00
wm4
ea7af58fc6 avformat/id3v2: support USLT tags 
I think this turned out pretty terrible. There's no good way to add new
custom tags that write to AVFormatContext->metadata.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 16:39:52 +01:00
Michael Niedermayer
bbfca8e84b avformat/utils: Clear pointer in ff_alloc_extradata() to avoid leaving a stale pointer in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 15:07:50 +01:00
Michael Niedermayer
59ca6e2586 avformat/hlsproto: Use av_freep, to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 15:07:50 +01:00
Michael Niedermayer
6e70e4aca5 avformat/matroskadec: Use av_freep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 15:07:50 +01:00
Michael Niedermayer
383c6a3a07 avformat/mov: use av_freep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 15:07:50 +01:00
Michael Niedermayer
62eafb6a0d avformat/mov: Clear array to prevent potential out of array read from av_dlog() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 15:07:50 +01:00