diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 18:48:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 18:54:15 +0200 |
| commit | 5440151fa42d4e18c83bc42ff31526680697e645 (patch) | |
| tree | 43851c2293c5cc89326ef227674a0f059290e904 /libavcodec/dvbsubdec.c | |
| parent | a1ac12bddd8ddb184281eadf5431dce29c02f27a (diff) | |
| parent | 3dc6272bed7890a49080e18eacf3c7a4a6594b0d (diff) | |
Merge commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d'
* commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d':
Remove a number of unnecessary dsputil.h #includes
Conflicts:
libavcodec/h264pred.c
libavcodec/vc1dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dvbsubdec.c')
| -rw-r--r-- | libavcodec/dvbsubdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index f94b3aefb7..4f408fe5ba 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -18,8 +18,8 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + #include "avcodec.h" -#include "dsputil.h" #include "get_bits.h" #include "bytestream.h" #include "libavutil/colorspace.h" |