1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

9 Commits

Author SHA1 Message Date
Peter Ross
e6cc30c22b wtvdec: also support big-sectors when fat depth is zero
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-15 16:57:35 +02:00
Michael Niedermayer
976a8b2179 Merge remote-tracking branch 'qatar/master'
* qatar/master: (40 commits)
  H.264: template left MB handling
  H.264: faster fill_decode_caches
  H.264: faster write_back_*
  H.264: faster fill_filter_caches
  H.264: make filter_mb_fast support the case of unavailable top mb
  Do not include log.h in avutil.h
  Do not include pixfmt.h in avutil.h
  Do not include rational.h in avutil.h
  Do not include mathematics.h in avutil.h
  Do not include intfloat_readwrite.h in avutil.h
  Remove return statements following infinite loops without break
  RTSP: Doxygen comment cleanup
  doxygen: Escape '\' in Doxygen documentation.
  md5: cosmetics
  md5: use AV_WL32 to write result
  md5: add fate test
  md5: include correct headers
  md5: fix test program
  doxygen: Drop array size declarations from Doxygen parameter names.
  doxygen: Fix parameter names to match the function prototypes.
  ...

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavformat/flvenc.c
	libavformat/oggenc.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-04 00:45:21 +02:00
Aurelien Jacobs
e6ba3d4281 replace remaining usage of deprecated av_metadata_set2() by av_dict_set() 2011-06-13 19:02:50 +02:00
Michael Niedermayer
25308afbb2 wtvdec: Avoid gmtime_r() it breaks compile on windows.
Better solutions welcome, this is just a quick fix to unbreak compile.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-09 04:17:24 +02:00
Peter Ross
fddf0521c6 wtv: calculate ole date correctly (is seconds since 1899-12-30) 2011-05-09 02:25:40 +02:00
Peter Ross
8acab7ae5b wtv: detect ole date overflow 2011-05-09 02:25:40 +02:00
zhentan feng
5edb23295e WTV: Add ff_ prefix to the moved fields.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-01 21:13:18 +02:00
zhentan feng
5ab826c165 WTV:move the common variable used by wtvdec.c and wtvenc.c to a new file wtv.h and wtv.c.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-01 21:12:02 +02:00
zhentan feng
80a330679f rename wtv.c to wtvdec.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-01 21:10:00 +02:00