diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-04 14:23:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-04 14:23:22 +0100 |
| commit | dacd6202ec50d122fcb7e9e92cdd014444cd2a98 (patch) | |
| tree | 0c9ceb86ced0b85eb1b1eccfc7346060b69a2b37 /tools/ffescape.c | |
| parent | 765debf51f1aee58b6748e575082ecd30033b323 (diff) | |
| parent | 1944d532a8a1c4b12222f0acfeb1153630dbc996 (diff) | |
| download | ffmpeg-dacd6202ec50d122fcb7e9e92cdd014444cd2a98.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ppc: always use pic for shared libraries
build: cosmetics: Move CONFIG_RTPDEC entry to a more suitable place
fate: ea, h264: prettyprinting and ordering cosmetics
Conflicts:
tests/fate/ea.mak
tests/fate/h264.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/ffescape.c')
0 files changed, 0 insertions, 0 deletions