virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
34,927 Commits 37 Branches 400 Tags 463 MiB
8709ba907a
Commit Graph

16258 Commits

Author SHA1 Message Date
Michael Niedermayer
8709ba907a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpegaudiodec: Don't use a nonexistent log context for av_dlog
  avformat: Accept the ISO8601 separate format as input, too
  avformat: Interpret times in ff_iso8601_to_unix_time as UTC
  avutil: Add av_timegm as a public function
  cinepak: Add another special case so that it can handle the following file:
  lagarith: add some RGBA decoding support
  lagarith: Add correct line prediction for RGB

Conflicts:
	doc/APIchanges
	libavcodec/cinepak.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-17 02:44:33 +01:00
Michael Niedermayer
4f7ad4c3e4 h264: migrate poc gap based has_b_frames calculation into new has_b_frame calculation code. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-17 01:08:17 +01:00
Michael Niedermayer
ed83f84891 h264: minor simplification 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-17 00:36:38 +01:00
Michael Niedermayer
bfca35114a h264: rewrite has_b_frame calculation code, 
the previous implementation was too buggy.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-17 00:01:40 +01:00
Michael Niedermayer
18b7f40007 h264: reset last_pocs on IDRs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 23:57:17 +01:00
Michael Niedermayer
7056f13a89 cinepak: remove redundant coordinate checks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 20:47:05 +01:00
Michael Niedermayer
cea0c82d9b cinepak: check strip_size 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 20:47:05 +01:00
Michael Niedermayer
f35f50b311 cinepak, simplify, use AV_RB24() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 20:46:59 +01:00
Michael Niedermayer
111ffa55b7 cinepak: simplify, use FFMIN() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 20:45:11 +01:00
Michael Niedermayer
4e7b3ef3b3 cinepak: Fix division by zero, ask for sample if encoded_buf_size is 0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 15:19:57 +01:00
Mike Melanson
12d9a36481 Add another special case to the Cinepak video decoder so that it can handle the following file: 
http://samples.mplayerhq.hu/V-codecs/CVID/bad_cinepak_frame_size.mov

This fix works around another work around which handles a different type
of odd Cinepak data.

Thanks to Matthew Hoops (clone2727 - gmail.com) for the sample and fix.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 15:13:01 +01:00
Martin Storsjö
268fb3f985 mpegaudiodec: Don't use a nonexistent log context for av_dlog 
This fixes builds with DEBUG defined, broken since
1158745a2d.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-11-16 12:01:32 +02:00
Mike Melanson
747283a078 cinepak: Add another special case so that it can handle the following file: 
http://samples.mplayerhq.hu/V-codecs/CVID/bad_cinepak_frame_size.mov

This fix works around another work around which handles a different type
of odd Cinepak data.

Thanks to Matthew Hoops (clone2727 - gmail.com) for the sample and fix.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-11-16 10:50:52 +02:00
Kostya Shishkov
ffc638c283 lagarith: add some RGBA decoding support 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-11-16 10:49:51 +02:00
Nathan Caldwell
39616fc307 lagarith: Add correct line prediction for RGB 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-11-16 10:46:30 +02:00
Clément Bœsch
4da45aff28 cleanup: remove various double end ';' all over the code. 2011-11-16 07:48:23 +01:00
Michael Niedermayer
20431a9982 wma: Check channel number before init. 
Fixes Ticket240

Based on patch by ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 03:37:44 +01:00
Michael Niedermayer
c1c836d9eb Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavf: fix multiplication overflow in avformat_find_stream_info()
  cosmetics: indentation
  mpegaudiodec: init static tables in AVCodec.init_static_data()

Conflicts:
	libavcodec/mpegaudiodec.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 02:27:31 +01:00
Michael Niedermayer
7776091b9f diracdec: obmc accesses arent aligned for all files. 
Thus use unaligned accesses.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-15 23:37:40 +01:00
Justin Ruggles
f1d1516e55 cosmetics: indentation 2011-11-15 12:17:20 -05:00
Justin Ruggles
1158745a2d mpegaudiodec: init static tables in AVCodec.init_static_data() 2011-11-15 12:17:20 -05:00
Michael Niedermayer
a72580fc9e Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  binkvideo: simplify and remove invalid shifts
  pulse: compute frame_duration once and fix it
  lavf: simplify format_child_class_next()
  hwaccel: OS X Video Decoder Acceleration (VDA) support.
  doc: add support for an optional navigation bar in texi2html pages

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/vda.c
	libavcodec/vda.h
	libavcodec/vda_h264.c
	libavcodec/vda_internal.h
	libavcodec/version.h
	libavformat/options.c
	libavutil/avutil.h
	libavutil/pixfmt.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-15 03:13:42 +01:00
Michael Niedermayer
be4c9a440f mpeg4videodec: dont treat empty frames as errors for QMP4, it seems thats normal. 
Fixes remaining complaints in Ticket560 possibly.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-15 02:25:19 +01:00
Michael Niedermayer
66cd3c12ab mpegaudio: prettify avpriv_mpa_bitrate_tab 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-15 01:59:59 +01:00
Clément Bœsch
edc26bfae5 vda: use K&R style. 2011-11-15 00:41:36 +01:00
Sebastien Zwickert
81852ef5d6 vda: get correctly the frame from h264 context. 2011-11-14 22:24:03 +01:00
Sebastien Zwickert
4590e161e6 vda: check allocation result. 2011-11-14 22:24:03 +01:00
Sebastien Zwickert
c7fa3eeab9 vda: removes useless casts. 2011-11-14 22:24:03 +01:00
Sebastien Zwickert
6e1e49385e vda: cosmetic. 2011-11-14 22:24:03 +01:00
Sebastien Zwickert
b46134f659 vda: reordering headers inclusion. 2011-11-14 22:24:03 +01:00
Sebastien Zwickert
9837442a39 vda: undef Picture. 2011-11-14 22:24:02 +01:00
Michael Niedermayer
ecf5e70548 vble: use dsp.add_hfyu_median_prediction() this allows asm optimizations to be used. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-14 18:29:37 +01:00
Michael Niedermayer
75c0ddc9c2 vble: move 2nd pass bitreading into vble_restore_plane() 
this improves data cache hits and speeds up grayscale only decoding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-14 18:29:29 +01:00
Michael Niedermayer
6718536ba5 diracdec: fix empty data units. 
Fixed Ticket636

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-14 18:14:20 +01:00
Mans Rullgard
3f5d6a665a binkvideo: simplify and remove invalid shifts 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-11-14 15:35:29 +00:00
Sebastien Zwickert
ac3dbb4d58 hwaccel: OS X Video Decoder Acceleration (VDA) support. 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-11-14 16:07:32 +01:00
KO Myung-Hun
ad0bdd2fd2 lavc: add supports of OS/2 threads 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-13 17:33:09 +01:00
Carl Eugen Hoyos
9117592549 Cosmetics: Increase readability. 2011-11-13 15:43:09 +01:00
Carl Eugen Hoyos
eb664d4ae3 Increase Westwood Studios VQA palette dynamics. 2011-11-13 15:12:43 +01:00
Carl Eugen Hoyos
1fc573dd25 Increase Sierra VMD palette dynamics. 2011-11-13 15:04:29 +01:00
Carl Eugen Hoyos
a95906af57 Increase Pictor/PC Paint palette dynamics. 2011-11-13 14:52:21 +01:00
Carl Eugen Hoyos
105cf82acb Increase FLI/FLC Animation palette dynamics for some samples. 2011-11-13 14:50:01 +01:00
Carl Eugen Hoyos
2b656844f8 Increase eXtended BINary text palette dynamics. 2011-11-13 14:42:22 +01:00
Carl Eugen Hoyos
942e9be5d7 Increase Bethesda VID palette dynamics. 2011-11-13 14:40:32 +01:00
Carl Eugen Hoyos
7ea77a6197 Set some Pictor/PC Paint palettes opaque. 2011-11-13 03:08:25 +01:00
Carl Eugen Hoyos
0d49dd3725 Set more KMVC palettes opaque. 2011-11-13 03:01:30 +01:00
Carl Eugen Hoyos
789da2e9f1 Set second Delphine Software International CIN palette opaque. 2011-11-13 02:47:47 +01:00
Michael Niedermayer
545ec935a4 h264: Use mismatching frame numbers in fields to synchronize the 
first/second field state independant of them being reference or not.
Fixes Ticket354

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-13 01:27:18 +01:00
Dominique Leuenberger
8a25d0a860 Trivial: j2kenc: fix compiler warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-12 21:00:12 +01:00
Carl Eugen Hoyos
3230c756f8 Increase Bitmap Brothers JV palette dynamics. 
Approved-by: Peter Ross
 2011-11-12 20:56:07 +01:00