Michael Niedermayer
7026d8accd
Merge commit '1b1bb2c4efc126d74d44d8c421860c85f932ecb1'
...
* commit '1b1bb2c4efc126d74d44d8c421860c85f932ecb1':
rl: Add error checking to ff_rl_init().
Conflicts:
libavcodec/rl.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-28 22:02:41 +02:00
Michael Niedermayer
c508fef3c7
Merge commit '324e50ee95929a9491b855c5e15451145bd5d1ec'
...
* commit '324e50ee95929a9491b855c5e15451145bd5d1ec':
rl: Add a function for freeing dynamically allocated tables.
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-28 21:55:20 +02:00
Michael Niedermayer
75647622b5
Merge commit '6f57375d707de40dcec28d3cef886c364e032c21'
...
* commit '6f57375d707de40dcec28d3cef886c364e032c21':
rl: Rename ff_*_rl() to ff_rl_*()
Conflicts:
libavcodec/mpeg4videodec.c
libavcodec/rl.c
libavcodec/rl.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-28 21:48:49 +02:00
Michael Niedermayer
68cce0101d
Merge commit 'fa1923f18205410a3b0aa6c0e77cb31443ef340d'
...
* commit 'fa1923f18205410a3b0aa6c0e77cb31443ef340d':
mpegvideo: Move ff_*_rl functions to a separate file
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-28 21:36:31 +02:00
Anton Khirnov
1b1bb2c4ef
rl: Add error checking to ff_rl_init().
2015-05-28 15:38:43 +01:00
Anton Khirnov
324e50ee95
rl: Add a function for freeing dynamically allocated tables.
...
Such tables are not used anywhere currently, but that should change.
2015-05-28 15:38:43 +01:00
Anton Khirnov
6f57375d70
rl: Rename ff_*_rl() to ff_rl_*()
2015-05-28 15:38:43 +01:00
Anton Khirnov
fa1923f182
mpegvideo: Move ff_*_rl functions to a separate file
2015-05-28 15:38:43 +01:00
