Michael Niedermayer
1b58f13761
Merge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1'
...
* commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1':
lavc: export DV profile API used by muxer/demuxer as public
Conflicts:
configure
doc/APIchanges
libavcodec/Makefile
libavcodec/dv_profile.c
libavcodec/dv_profile.h
libavcodec/version.h
libavformat/dvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09 22:27:07 +02:00
Anton Khirnov
f6ee61fb05
lavc: export DV profile API used by muxer/demuxer as public
2014-07-09 13:35:07 +00:00
Michael Niedermayer
14e2406de7
Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3'
...
* commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3':
dsputil: Split off FDCT bits into their own context
Conflicts:
configure
libavcodec/Makefile
libavcodec/asvenc.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/x86/Makefile
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08 03:19:06 +02:00
Diego Biurrun
a9aee08d90
dsputil: Split off FDCT bits into their own context
2014-07-07 12:28:45 -07:00
Michael Niedermayer
3ac5114530
Merge commit 'e63b818dbe6060b606ae10eb184859f8b97d2353'
...
* commit 'e63b818dbe6060b606ae10eb184859f8b97d2353':
dv: Properly split decoder and encoder initialization
Conflicts:
libavcodec/dv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27 19:13:34 +02:00
Diego Biurrun
e63b818dbe
dv: Properly split decoder and encoder initialization
2014-06-27 05:03:06 -07:00
Michael Niedermayer
b0fdc76600
Merge commit '650dee63c8b1e6693c6cf5983f4a5ed3f571379f'
...
* commit '650dee63c8b1e6693c6cf5983f4a5ed3f571379f':
dv: get rid of global non-const tables
Conflicts:
libavcodec/dv_profile.h
libavcodec/dvdec.c
libavcodec/dvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20 18:00:42 +02:00
Michael Niedermayer
c2b1225c16
Merge commit '778111592bf5f38630858ee6dfcfd097cd6c6da9'
...
* commit '778111592bf5f38630858ee6dfcfd097cd6c6da9':
dvenc: initialize the profile only once, at init
Conflicts:
libavcodec/dvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20 17:15:39 +02:00
Anton Khirnov
650dee63c8
dv: get rid of global non-const tables
...
Instead, store them in the context and compute on each parameter change.
2014-06-20 14:15:31 +02:00
Anton Khirnov
778111592b
dvenc: initialize the profile only once, at init
...
We do not allow the frame parameters to change during encoding, so there
is no need to do this for each frame.
2014-06-20 14:15:16 +02:00
Michael Niedermayer
47fc82b5b3
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
dsputil: Move DV-specific ff_zigzag248_direct table to dvdata
Conflicts:
libavcodec/dv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-05 19:43:28 +02:00
Diego Biurrun
5f92204370
dsputil: Move DV-specific ff_zigzag248_direct table to dvdata
2014-04-04 19:08:05 +02:00
Michael Niedermayer
add54280bf
Merge commit '984e3398662d460e15904f9e4a6df9ef759070cb'
...
* commit '984e3398662d460e15904f9e4a6df9ef759070cb':
avcodec: Consistently name encoder init functions foo_encode_init
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 15:27:03 +01:00
Diego Biurrun
984e339866
avcodec: Consistently name encoder init functions foo_encode_init
2014-02-20 04:16:15 -08:00
Michael Niedermayer
94a849b8b6
Merge commit 'd4f1188d1a662fed5347e70016da49e01563e8a8'
...
* commit 'd4f1188d1a662fed5347e70016da49e01563e8a8':
dv: use AVFrame API properly
Conflicts:
libavcodec/dvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09 20:10:15 +01:00
Anton Khirnov
d4f1188d1a
dv: use AVFrame API properly
2013-12-09 09:10:14 +01:00
Michael Niedermayer
830be99ae1
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
dv: Split off DV video encoder into its own file
Conflicts:
libavcodec/dv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-02 23:04:05 +01:00
Diego Biurrun
97d19c2fec
dv: Split off DV video encoder into its own file
2013-12-02 13:13:09 +01:00
