aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/aacpsdata.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-12 14:41:24 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-12 14:41:24 +0100
commit74744790a366ed53cfafa2b0720c27b1eaef770a (patch)
tree0f9c54c49bb63764ce3474117bdf6af043bbcd56 /libavcodec/aacpsdata.c
parentbb6b1731eba2fac424ff8ad3003fe58b308debd1 (diff)
parent25a1ba814ad80056247fd357ec4c6911324a3f66 (diff)
downloadffmpeg-74744790a366ed53cfafa2b0720c27b1eaef770a.tar.gz
Merge commit '25a1ba814ad80056247fd357ec4c6911324a3f66'
* commit '25a1ba814ad80056247fd357ec4c6911324a3f66': log: Have function parameter names match between .c and .h file Conflicts: libavutil/log.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacpsdata.c')
0 files changed, 0 insertions, 0 deletions