diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-14 14:02:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-14 14:02:19 +0200 |
| commit | dbd1fdd21400189f64aedde6a94ea14beca5a85e (patch) | |
| tree | 3b647f612fbc4310b2a56c0eb690c0cc3c21818f /libavcodec/mpeg12dec.c | |
| parent | 6a72260e6baf38403c8c26d010425f52dea7817a (diff) | |
| parent | 7e90133f6420b1c53652f972b9561600822881ee (diff) | |
| download | ffmpeg-dbd1fdd21400189f64aedde6a94ea14beca5a85e.tar.gz | |
Merge commit '7e90133f6420b1c53652f972b9561600822881ee'
* commit '7e90133f6420b1c53652f972b9561600822881ee':
build: do not append $(FFLIBS-) to $(FFLIBS) if $(NAME) is not defined
Conflicts:
common.mak
See: efa95968317411179b0016af54745906029c2295
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg12dec.c')
0 files changed, 0 insertions, 0 deletions